Merge pull request #22 from percival-detector/dev

Unicode updates for python 2.7
percival-detector · Aug 24, 2017 · 1a6f4d2 · 1a6f4d2
2 parents 293d0cd + f97b795
commit 1a6f4d2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/percival/carrier/chip.py b/percival/carrier/chip.py
@@ -36,7 +36,7 @@ def load_ini(self, settings_ini):
             self.log.info(map)
             # First replace any true or false with 1 or 0
             for item in map:
-                if isinstance(map[item], str):
+                if isinstance(map[item], str) or isinstance(map[item], unicode):
                     if 'false' in map[item].lower():
                         map[item] = 0
                     elif 'true' in map[item].lower():

diff --git a/percival/carrier/configuration.py b/percival/carrier/configuration.py
@@ -612,7 +612,7 @@ def __init__(self, ini_file):
             self._ini_filename = find_file(ini_file)
         except:
             # If we catch any kind of exception here then treat the parameter as the configuration
-            self._ini_buffer = StringIO(ini_file)
+            self._ini_buffer = StringIO(unicode(ini_file))
 
     def load_ini(self):
         """
@@ -669,7 +669,7 @@ def __init__(self, ini_file):
             self._ini_filename = find_file(ini_file)
         except:
             # If we catch any kind of exception here then treat the parameter as the configuration
-            self._ini_buffer = StringIO(ini_file)
+            self._ini_buffer = StringIO(unicode(ini_file))
 
     def load_ini(self):
         """
@@ -727,7 +727,7 @@ def __init__(self, ini_file):
             self._ini_filename = find_file(ini_file)
         except:
             # If we catch any kind of exception here then treat the parameter as the configuration
-            self._ini_buffer = StringIO(ini_file)
+            self._ini_buffer = StringIO(unicode(ini_file))
 
     def load_ini(self):
         """
@@ -770,7 +770,7 @@ def __init__(self, ini_file):
             self._ini_filename = find_file(ini_file)
         except:
             # If we catch any kind of exception here then treat the parameter as the configuration
-            self._ini_buffer = StringIO(ini_file)
+            self._ini_buffer = StringIO(unicode(ini_file))
 
     def load_ini(self):
         """
@@ -813,7 +813,7 @@ def __init__(self, ini_file):
             self._ini_filename = find_file(ini_file)
         except:
             # If we catch any kind of exception here then treat the parameter as the configuration
-            self._ini_buffer = StringIO(ini_file)
+            self._ini_buffer = StringIO(unicode(ini_file))
 
     def load_ini(self):
         """
@@ -856,7 +856,7 @@ def __init__(self, ini_file):
             self._ini_filename = find_file(ini_file)
         except:
             # If we catch any kind of exception here then treat the parameter as the configuration
-            self._ini_buffer = StringIO(ini_file)
+            self._ini_buffer = StringIO(unicode(ini_file))
 
     def load_ini(self):
         """
@@ -907,7 +907,7 @@ def __init__(self, ini_file):
             self._ini_filename = find_file(ini_file)
         except:
             # If we catch any kind of exception here then treat the parameter as the configuration
-            self._ini_buffer = StringIO(ini_file)
+            self._ini_buffer = StringIO(unicode(ini_file))
 
     def load_ini(self):
         """
@@ -970,7 +970,7 @@ def __init__(self, ini_file):
             self._ini_filename = find_file(ini_file)
         except:
             # If we catch any kind of exception here then treat the parameter as the configuration
-            self._ini_buffer = StringIO(ini_file)
+            self._ini_buffer = StringIO(unicode(ini_file))
 
     def load_ini(self):
         """

diff --git a/percival/carrier/system.py b/percival/carrier/system.py
@@ -119,7 +119,7 @@ def load_ini(self, settings_ini):
             self._log.info("Full description of ini %s", map)
             # First replace any true or false with 1 or 0
             for item in map:
-                if isinstance(map[item], str):
+                if isinstance(map[item], str) or isinstance(map[item], unicode):
                     if 'false' in map[item].lower():
                         map[item] = 0
                     elif 'true' in map[item].lower():
@@ -195,7 +195,7 @@ def load_ini(self, settings_ini):
             self._log.info("Full description of ini %s", map)
             # First replace any true or false with 1 or 0
             for item in map:
-                if isinstance(map[item], str):
+                if isinstance(map[item], str) or isinstance(map[item], unicode):
                     if 'false' in map[item].lower():
                         map[item] = 0
                     elif 'true' in map[item].lower():

diff --git a/percival/detector/detector.py b/percival/detector/detector.py
@@ -11,6 +11,7 @@
 from datetime import datetime, timedelta
 import getpass
 import sys
+import traceback
 is_py2 = sys.version[0] == '2'
 if is_py2:
     import Queue as queue
@@ -817,7 +818,9 @@ def command_loop(self):
             except PercivalDetectorError as e:
                 self._active_command.complete(success=False, message=str(e))
             except Exception as e:
-                self._active_command.complete(success=False, message="Unhandled exception: {}".format(str(e)))
+                type_, value_, traceback_ = sys.exc_info()
+                ex = traceback.format_exception(type_, value_, traceback_)
+                self._active_command.complete(success=False, message="Unhandled exception: {} => {}".format(str(e), str(ex)))
 
     def execute_command(self, command):
         """