fix translation errors

halgari · halgari · commit d35ef4be6cf4 · 2014-10-17T16:07:49.000-06:00
diff --git a/pixie/vm/code.py b/pixie/vm/code.py
@@ -342,7 +342,7 @@ def _invoke(self, args):
 
 class Refer(py_object):
     def __init__(self, ns, refer_syms=[], refer_all=False):
-        self._ns = ns
+        self._namespace = ns
         self._refer_syms = refer_syms
         self._refer_all = refer_all
 
@@ -359,7 +359,8 @@ def __init__(self, name):
         self._refers = {}
 
     def intern_or_make(self, name):
-        affirm(isinstance(name, unicode), u"Var names must be unicode")
+        assert name is not None
+        #\affirm(isinstance(name, unicode), u"Var names must be unicode")
         v = self._registry.get(name, None)
         if v is None:
             v = Var(self._name, name)
@@ -383,11 +384,14 @@ def resolve(self, s, use_refers=True):
         name = rt.name(s)
 
         if ns is not None:
-            resolved_ns = self._refers.get(ns, None)
+            refer = self._refers.get(ns, None)
+            resolved_ns = None
+            if refer is not None:
+                resolved_ns = refer._namespace
             if resolved_ns is None:
                 resolved_ns = _ns_registry.get(ns, None)
             if resolved_ns is None:
-                affirm(False, u"Unable to resolve namespace: " + resolved_ns + u" inside namespace " + self._name)
+                affirm(False, u"Unable to resolve namespace: " + ns + u" inside namespace " + self._name)
         else:
             resolved_ns = self
 
@@ -396,7 +400,7 @@ def resolve(self, s, use_refers=True):
             for refer_nm in self._refers:
                 refer = self._refers[refer_nm]
                 if name in refer._refer_syms or refer._refer_all:
-                    var = refer._ns.resolve(symbol.Symbol(name), False)
+                    var = refer._namespace.resolve(symbol.Symbol(name), False)
                 if var is not None:
                     return var
             return None
@@ -412,7 +416,7 @@ def __init__(self):
         self._registry = {}
 
     def find_or_make(self, name):
-        affirm(isinstance(name, unicode), u"Namespace names must be unicode")
+        #affirm(isinstance(name, unicode), u"Namespace names must be unicode")
         v = self._registry.get(name, None)
         if v is None:
             v = Namespace(name)
diff --git a/pixie/vm/object.py b/pixie/vm/object.py
@@ -20,7 +20,7 @@ def register_type(self, nm, tp):
 
     def var_for_type_and_name(self, nm, tp):
         from pixie.vm.symbol import symbol
-        splits = nm.split(".")
+        splits = nm.split(u".")
         size = len(splits) - 1
         assert size >= 0
         ns = u".".join(splits[:size])
@@ -43,7 +43,7 @@ def get_by_name(self, nm, default=None):
 
 class Type(Object):
     def __init__(self, name):
-        assert isinstance(name, unicode), u"Type names must be unicode"
+        #assert isinstance(name, unicode), u"Type names must be unicode"
         _type_registry.register_type(name, self)
         self._name = name
 
diff --git a/pixie/vm/reader.py b/pixie/vm/reader.py
@@ -19,7 +19,7 @@ class PlatformReader(object.Object):
 class StringReader(PlatformReader):
 
     def __init__(self, s):
-        affirm(isinstance(s, unicode), u"StringReader requires unicode")
+        #affirm(isinstance(s, unicode), u"StringReader requires unicode")
         self._str = s
         self._idx = 0
 
diff --git a/pixie/vm/string.py b/pixie/vm/string.py
@@ -14,7 +14,7 @@ def type(self):
         return String._type
 
     def __init__(self, s):
-        assert isinstance(s, unicode)
+        #assert isinstance(s, unicode)
         self._str = s
 
 
diff --git a/pixie/vm/symbol.py b/pixie/vm/symbol.py
@@ -9,7 +9,7 @@ class Symbol(object.Object):
     _type = object.Type(u"pixie.stdlib.Symbol")
 
     def __init__(self, s):
-        assert isinstance(s, unicode)
+        #assert isinstance(s, unicode)
         self._str = s
         self._w_name = None
         self._w_ns = None
diff --git a/pixie/vm/util.py b/pixie/vm/util.py
@@ -34,7 +34,7 @@ def mix_h1(h1, k1):
     return h1
 
 def hash_unencoded_chars(u):
-    assert isinstance(u, unicode)
+    #assert isinstance(u, unicode)
     h1 = seed
 
     # step through the CharSequence 2 chars at a time
