Properly switch for unicode checking.

kernel/modelverse_jit/tree_ir.py

@@ -29,6 +29,7 @@
 # pylint: disable=I0011,W0141
 
 import kernel.modelverse_jit.source_map as source_map
+import sys
 
 PROFILING = False
 
@@ -1097,16 +1098,17 @@ class VariableInstruction(Instruction):
     def __init__(self, name):
         Instruction.__init__(self)
 
-        try:
-            if isinstance(name, unicode):
+        if sys.version_info[0] < 3:
+            if isinstance(name, unicode) or isinstance(name, str) or name is None:
                 self.name = VariableName(name)
-        except NameError:
-            pass
-
-        if isinstance(name, str) or name is None:
-            self.name = VariableName(name)
+            else:
+                self.name = name
         else:
-            self.name = name
+            if isinstance(name, str) or name is None:
+                self.name = VariableName(name)
+            else:
+                self.name = name
+
 
     def get_children(self):
         """Gets this instruction's sequence of child instructions."""
@@ -1189,16 +1191,16 @@ class TupleStoreLocalInstruction(VoidInstruction):
         tuple_lhs = []
         tuple_rhs = []
         for name, value in self.name_value_pairs:
-            try:
-                if isinstance(name, unicode):
+            if sys.version_info[0] < 3:
+                if isinstance(name, unicode) or isinstance(name, str) or name is None:
                     variable = VariableName(name)
-            except NameError:
-                pass
-
-            if isinstance(name, str) or name is None:
-                variable = VariableName(name)
+                else:
+                    variable = name
             else:
-                variable = name
+                if isinstance(name, str) or name is None:
+                    variable = VariableName(name)
+                else:
+                    variable = name
 
             # Retrieve the result name for the variable.
             var_result_name = code_generator.get_result_name(variable)