Merge pull request #2 from DikNuken/master

Unicode support
LPgenerator · Jun 24, 2014 · 453306e · 453306e
2 parents e10a95f + 5a403f3
commit 453306e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mmc/mixins.py b/mmc/mixins.py
@@ -61,7 +61,7 @@ def __mmc_one_copy(self):
                 self.__mmc_check_is_running()
                 self.__mmc_lock()
         except Exception, msg:
-            print '[MMC]', msg.__str__()
+            print '[MMC]', msg.__unicode__()
 
     def execute(self, *args, **options):
         self.__mmc_one_copy()
@@ -72,7 +72,7 @@ def execute(self, *args, **options):
             self._no_monkey.execute(self, *args, **options)
         except Exception, ex:
             self._success = False
-            self._error_message = ex.__str__()
+            self._error_message = ex.__unicode__()
             self._traceback = traceback.format_exc()
 
     def __mmc_store_log(self):
@@ -90,7 +90,7 @@ def __mmc_store_log(self):
                 sys_argv=' '.join(map(unicode, sys.argv))
             )
         except Exception, msg:
-            print '[MMC] Logging broken with message:', msg.__str__()
+            print '[MMC] Logging broken with message:', msg.__unicode__()
 
     def __mmc_send_mail(self):
         if not self._success:

diff --git a/mmc/models.py b/mmc/models.py
@@ -82,4 +82,4 @@ def send(cls, message):
                 send_mail(
                     SUBJECT, message, settings.DEFAULT_FROM_EMAIL, emails)
         except Exception, msg:
-            print '[MMC]', msg.__str__()
+            print '[MMC]', msg.__unicode__()