Merge pull request #5312 from Gobberwart/dev_unicodeerror

UnicodeDecodeError catch
PokemonGoF · Sep 9, 2016 · 732463c · 732463c
2 parents 8ed3445 + aec586d
commit 732463c
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/pokecli.py b/pokecli.py
@@ -798,9 +798,8 @@ def fix_nested_config(config):
 def parse_unicode_str(string):
     try:
         return string.decode('utf8')
-    except UnicodeEncodeError:
+    except (UnicodeEncodeError,UnicodeDecodeError):
         return string
 
-
 if __name__ == '__main__':
     main()