fixed import related bugs and bugs that appeared during the merge

Author: wkornewald

examples/libtest/I18N/__init__.py

@@ -11,9 +11,9 @@ def another_example(self):
 domains = []
 
 import sys
-import domain
+import I18N.domain
 domains.append('domain')
-import domain.subdomain
+import I18N.domain.subdomain
 domains.append('domain.subdomain')
 
 def set_locale(loc):

examples/libtest/b.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-C:/python26/python.exe ./load_issues.py
+C:/python27/python.exe ./load_issues.py
 ../../bin/pyjsbuild.py --no-compile-inplace --strict --dynamic '^I18N[.].*.._..' $@ LibTest `findlinux I18N -name ??_??.py`
 # For --translator=dict
 #  - disable the generator test for now (will hang forever)

examples/libtest/imports/__init__.py

@@ -30,5 +30,5 @@ def conditional_func():
 # Import all
 all_masked = False
 all_override = False
-from allwith__all__ import *
-from allsimple import *
+from .allwith__all__ import *
+from .allsimple import *

examples/libtest/imports/cls1.py

@@ -1,3 +1,3 @@
 
-from cls import CLS
+from .cls import CLS
 

examples/libtest/imports/override.py

@@ -1,2 +1,2 @@
 
-import overrideme
+from . import overrideme

pyjs/src/pyjs/builtin/pyjslib.py

@@ -7135,7 +7135,7 @@ def sprintf(strng, args):
     return result.join("");
 """)
 
-__module_internals = set(['__track_lines__'])
+__module_internals = set(['__track_lines__', 'toString'])
 def _globals(module):
     """
     XXX: It should return dictproxy instead!

pyjs/src/pyjs/lib/os/__init__.py

@@ -1,4 +1,4 @@
-import path
+from . import path
 
 name = 'pyjs'
 

pyjs/src/pyjs/translator_proto.py

@@ -974,7 +974,7 @@ def __init__(self, compiler,
         # print out the deps and check for wrong imports
         if self.imported_modules:
             self.w( '/*')
-            self.w( 'PYJS_DEPS: %s' % map(uescapejs, self.imported_modules))
+            self.w( 'PYJS_DEPS: %s' % map(str, self.imported_modules))
             self.w( '*/')
 
         # print out the imported js
@@ -1891,8 +1891,7 @@ def _import(self, node, current_klass, root_level = False):
         # object to check our scope
         self._doImport(node.names, current_klass, root_level, True)
 
-    def _doImport(self, names, current_klass, root_level, assignBase,
-                  absPath=False, all=False):
+    def _doImport(self, names, current_klass, root_level, assignBase, all=False):
         if root_level:
             modtype = 'root-module'
         else:
@@ -1931,10 +1930,7 @@ def _doImport(self, names, current_klass, root_level, assignBase,
                 or (assignBase and not package_mod[0] in ['root-module', 'module'])
                ):
                 # the import statement
-                if absPath:
-                    context = 'null'
-                else:
-                    context = self.import_context
+                context = 'null'
                 if not all:
                     import_stmt = "@{{___import___}}('%s', %s" % (
                         importName,
@@ -2011,9 +2007,6 @@ def _from(self, node, current_klass, root_level=False):
                     # Ignoring from __future__ import name[0]
                     pass
             return
-        # TODO: check again if this really works correctly. We've switched to absolute
-        # imports like in Python 3.
-        absPath = True
         modname = node.modname
         if hasattr(node, 'level') and node.level > 0:
             if self.relative_import_context is not None:
@@ -2032,11 +2025,11 @@ def _from(self, node, current_klass, root_level=False):
         for name in node.names:
             if name[0] == "*":
                 self._doImport(((modname, name[0]),), current_klass,
-                               root_level, False, absPath, True)
+                               root_level, False, True)
                 continue
             sub = modname + '.' + name[0]
             ass_name = name[1] or name[0]
-            self._doImport(((sub, ass_name),), current_klass, root_level, True, absPath)
+            self._doImport(((sub, ass_name),), current_klass, root_level, True)
 
     def _function(self, node, current_klass, force_local=False):
         save_top_level = self.top_level
@@ -3102,8 +3095,8 @@ def _assigns_list(self, v, current_klass, expr, kind=None): # DANIEL KLUEV VERSI
             if self.descriptors:
                 desc_setattr = ("""%(l)s.__is_instance__ && """
                                 """typeof %(l)s.__setattr__ == 'function' ? """
-                                """%(l)s.__setattr__('%(a)s', %(r)s) : """
-                                """%(setattr)s(%(l)s, '%(a)s', %(r)s); """ % 
+                                """%(l)s.__setattr__(%(a)s, %(r)s) : """
+                                """%(setattr)s(%(l)s, %(a)s, %(r)s); """ %
                                 dict(
                                     setattr=self.pyjslib_name('setattr'),
                                     l=lhs,
@@ -4584,10 +4577,8 @@ def visitFrom(self, node):
             return
         # XXX: hack for in-function checking, we should have another
         # object to check our scope
-        absPath = False
         modname = node.modname
         if hasattr(node, 'level') and node.level > 0:
-            absPath = True
             modname = self.module_name.split('.')
             level = node.level
             if len(modname) < level: