just alignment of custom_import

VERSION

@@ -1 +1 @@
-Version 2.1.0 (2012-10-11 08:27:52) dev
+Version 2.1.0 (2012-10-11 09:23:31) dev

gluon/custom_import.py

@@ -22,7 +22,6 @@ def is_tracking_changes():
     @return: True: neo_importer is tracking changes made to Python source
     files. False: neo_import does not reload Python modules.
     """
-
     global _is_tracking_changes
     return _is_tracking_changes
 
@@ -73,12 +72,9 @@ class _BaseImporter(object):
         """
         The import method itself.
         """
-        return self._STANDARD_PYTHON_IMPORTER(name,
+        return self._STANDARD_PYTHON_IMPORTER(
-                                         globals,
+            name,globals,locals,fromlist,level)
-                                         locals,
+            
-                                         fromlist,
-                                         level)
-
     def end(self):
         """
         Needed for clean up.
@@ -232,16 +228,12 @@ class _Web2pyImporter(_BaseImporter):
         self.super_class.__init__()
         self.web2py_path =  web2py_path
         self.__web2py_path_os_path_sep = self.web2py_path+os.path.sep
-        self.__web2py_path_os_path_sep_len = len(self.__web2py_path_os_path_sep)
+        self.__web2py_path_os_path_sep_len = \
+            len(self.__web2py_path_os_path_sep)
         self.__RE_APP_DIR = re.compile(
-          self._RE_ESCAPED_PATH_SEP.join( \
+            self._RE_ESCAPED_PATH_SEP.join(( \
-          ( \
+                    #"^" + re.escape(web2py_path),# Not working with Python 2.5
-            #"^" + re.escape(web2py_path),   # Not working with Python 2.5
+                    "^(" + "applications","[^","]+)","")))
-            "^(" + "applications",
-            "[^",
-            "]+)",
-            "",
-          ) ))
 
     def _matchAppDir(self, file_path):
         """
@@ -270,8 +262,8 @@ class _Web2pyImporter(_BaseImporter):
                     and not name.startswith("applications.") \
                     and isinstance(globals, dict):
             # Get the name of the file do the import
-            caller_file_name = os.path.join(self.web2py_path, \
+            caller_file_name = os.path.join(
-                                            globals.get("__file__", ""))
+                self.web2py_path, globals.get("__file__", ""))
             # Is the path in an application directory?
             match_app_dir = self._matchAppDir(caller_file_name)
             if match_app_dir:
@@ -293,11 +285,11 @@ class _Web2pyImporter(_BaseImporter):
                 except ImportError, e:
                     try:
                         return self.super_class.__call__(name, globals, locals,
-                                                    fromlist, level)
+                                                         fromlist, level)
                     except ImportError, e1:
                         raise e
         return self.super_class.__call__(name, globals, locals,
-                                                    fromlist, level)
+                                         fromlist, level)
 
     def __import__dot(self, prefix, name, globals, locals, fromlist,
                       level):
@@ -311,8 +303,8 @@ class _Web2pyImporter(_BaseImporter):
 
         result = None
         for name in name.split("."):
-            new_mod = super(_Web2pyImporter, self).__call__(prefix, globals,
+            new_mod = super(_Web2pyImporter, self).__call__(
-                                                        locals, [name], level)
+                prefix, globals,locals, [name], level)
             try:
                 result = result or new_mod.__dict__[name]
             except KeyError, e:

gluon/shell.py

@@ -19,7 +19,7 @@ import optparse
 import glob
 import traceback
 import fileutils
-import settings
+from settings import global_settings
 from utils import web2py_uuid
 from compileapp import build_environment, read_pyc, run_models_in
 from restricted import RestrictedError
@@ -27,7 +27,7 @@ from globals import Request, Response, Session
 from storage import Storage
 from admin import w2p_unpack
 from dal import BaseAdapter
-
+from custom_import import custom_import_install
 
 logger = logging.getLogger("web2py")
 
@@ -112,7 +112,7 @@ def env(
     request.env.path_info = '/%s/%s/%s' % (a, c, f)
     request.env.http_host = '127.0.0.1:8000'
     request.env.remote_addr = '127.0.0.1'
-    request.env.web2py_runtime_gae = settings.global_settings.web2py_runtime_gae
+    request.env.web2py_runtime_gae = global_settings.web2py_runtime_gae
 
     for k,v in extra_request.items():
         request[k] = v