Merge branch 'master' into develop

This commit is contained in:
JackDandy 2018-05-22 04:21:07 +01:00
commit 5e828d283a
2 changed files with 7 additions and 2 deletions

View file

@ -16,6 +16,11 @@
### 0.16.11 (2018-05-22 00:00:00 UTC)
* Fix SickGear-NG.py post processing script
### 0.16.10 (2018-05-21 23:30:00 UTC)
* Fix importing TV shows with utf8 characters in parent folders on Windows

View file

@ -307,8 +307,8 @@ class Ek:
def ek(func, *args, **kwargs):
if 'nt' == os.name:
# convert all str parameter values to unicode
args = tuple([x if not isinstance(x, str) else win_encode_unicode(x) for x in args])
kwargs = {k: x if not isinstance(x, str) else win_encode_unicode(x) for k, x in
args = tuple([x if not isinstance(x, str) else Ek.win_encode_unicode(x) for x in args])
kwargs = {k: x if not isinstance(x, str) else Ek.win_encode_unicode(x) for k, x in
kwargs.iteritems()}
func_result = func(*args, **kwargs)
else: