Merge pull request #6136 from goedzo/Fixing-#6123

#6123 #6136
PokemonGoF · Jul 25, 2017 · 850713a · 850713a
2 parents 15b2b56 + 7829fa6
commit 850713a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pokemongo_bot/event_manager.py b/pokemongo_bot/event_manager.py
@@ -54,8 +54,10 @@ def __init__(self, event, sender=None, level='info', formatted='', data={}):
         self.level = str(level).encode('ascii', 'xmlcharrefreplace')
 
         #Fixing issue 6123 for gym names that are in utf format.
-        self.formatted = str(formatted).encode('utf-8', 'ignore').decode('utf-8')
-        self.formatted = str(formatted).encode('ascii', 'xmlcharrefreplace')
+        try:
+            self.formatted = str(formatted).encode('ascii', 'xmlcharrefreplace')
+        except UnicodeEncodeError:
+            self.formatted = str(unicode(formatted).encode('unicode_escape'))
 
         self.data = str(data).encode('ascii', 'xmlcharrefreplace')
         self.friendly_msg = ""