Fix more relative imports and unicode usage.

kernel/modelverse_kernel/compiled.py

@@ -1,5 +1,5 @@
-from modelverse_kernel.primitives import PrimitiveFinished
-import modelverse_jit.runtime as jit_runtime 
+from kernel.modelverse_kernel.primitives import PrimitiveFinished
+import kernel.modelverse_jit.runtime as jit_runtime
 import time
 
 def get_superclasses(a, b, **remainder):

kernel/modelverse_kernel/legacy.py

@@ -1,8 +1,8 @@
 """A legacy version of the Modelverse kernel. This kernel can be used as a baseline for the
 performance of newer kernels."""
 
-import modelverse_kernel.primitives as primitive_functions
-import modelverse_kernel.compiled as compiled_functions
+import kernel.modelverse_kernel.primitives as primitive_functions
+import kernel.modelverse_kernel.compiled as compiled_functions
 from collections import defaultdict
 import sys
 import time

kernel/modelverse_kernel/main.py

@@ -1,10 +1,10 @@
-import modelverse_kernel.primitives as primitive_functions
-import modelverse_kernel.compiled as compiled_functions
-from modelverse_kernel.request_handler import RequestHandler
-import modelverse_jit.jit as jit
-import modelverse_jit.intrinsics as jit_intrinsics
-import modelverse_jit.jit_primitives as jit_primitives
-import modelverse_jit.runtime as jit_runtime
+import kernel.modelverse_kernel.primitives as primitive_functions
+import kernel.modelverse_kernel.compiled as compiled_functions
+from kernel.modelverse_kernel.request_handler import RequestHandler
+import kernel.modelverse_jit.jit as jit
+import kernel.modelverse_jit.intrinsics as jit_intrinsics
+import kernel.modelverse_jit.jit_primitives as jit_primitives
+import kernel.modelverse_jit.runtime as jit_runtime
 from collections import defaultdict
 import sys
 import time

kernel/modelverse_kernel/primitives.py

@@ -270,12 +270,20 @@ def dict_keys(a, **remainder):
 
 def is_physical_int(a, **remainder):
     t, = yield [("RV", [a])]
-    result, = yield [("CNV", [isinstance(t, int) or isinstance(t, long)])]
+    try:
+        result, = yield [("CNV", [isinstance(t, int) or isinstance(t, long)])]
+    except NameError:
+        result, = yield [("CNV", [isinstance(t, int)])]
+
     raise PrimitiveFinished(result)
 
 def is_physical_string(a, **remainder):
     t, = yield [("RV", [a])]
-    result, = yield [("CNV", [isinstance(t, str) or isinstance(t, unicode)])]
+    try:
+        result, = yield [("CNV", [isinstance(t, str) or isinstance(t, unicode)])]
+    except NameError:
+        result, = yield [("CNV", [isinstance(t, str)])]
+
     raise PrimitiveFinished(result)
 
 def is_physical_float(a, **remainder):

kernel/modelverse_kernel/request_handler.py

@@ -1,6 +1,6 @@
 import sys
-import modelverse_kernel.primitives as primitive_functions
-import modelverse_jit.runtime as jit_runtime
+import kernel.modelverse_kernel.primitives as primitive_functions
+import kernel.modelverse_jit.runtime as jit_runtime
 from collections import defaultdict
 
 class KnownRequestHandled(Exception):