Changeset 3951

Timestamp:

10/30/06 14:50:27 (2 years ago)

Author:

adrian

Message:

Fixed #2968 -- Changed arguments to import to use empty dictionary instead of empty string, for stricter compliance with Python library reference. Thanks for the patch, Yasushi Masuda

Files:

• django/trunk/django/conf/__init__.py (modified) (2 diffs)
• django/trunk/django/contrib/admin/views/doc.py (modified) (4 diffs)
• django/trunk/django/contrib/admin/views/template.py (modified) (1 diff)
• django/trunk/django/contrib/auth/__init__.py (modified) (1 diff)
• django/trunk/django/core/cache/__init__.py (modified) (1 diff)
• django/trunk/django/core/handlers/base.py (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (3 diffs)
• django/trunk/django/core/serializers/__init__.py (modified) (1 diff)
• django/trunk/django/core/urlresolvers.py (modified) (5 diffs)
• django/trunk/django/db/__init__.py (modified) (2 diffs)
• django/trunk/django/db/models/loading.py (modified) (1 diff)
• django/trunk/django/template/context.py (modified) (1 diff)
• django/trunk/django/template/__init__.py (modified) (1 diff)
• django/trunk/django/template/loaders/app_directories.py (modified) (1 diff)
• django/trunk/django/templatetags/__init__.py (modified) (1 diff)
• django/trunk/django/test/simple.py (modified) (1 diff)
• django/trunk/django/views/debug.py (modified) (1 diff)

django/trunk/django/conf/__init__.py

@@ -78 +78 @@
-
-        try:
-'', ''
+{}, {}
-        except ImportError, e:
-            raise EnvironmentError, "Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e)
@@ -98 +98 @@
-        for app in self.INSTALLED_APPS:
-            if app.endswith('.*'):
-'', ''
+{}, {}
-                for d in os.listdir(appdir):
-                    if d.isalpha() and os.path.isdir(os.path.join(appdir, d)):

django/trunk/django/contrib/admin/views/doc.py

@@ -99 +99 @@
-
-    if settings.ADMIN_FOR:
-'', ''
+{}, {}
-    else:
-        settings_modules = [settings]
@@ -105 +105 @@
-    views = []
-    for settings_mod in settings_modules:
-'', ''
+{}, {}
-        view_functions = extract_views_from_urlpatterns(urlconf.urlpatterns)
-        if Site._meta.installed:
@@ -128 +128 @@
-    mod, func = urlresolvers.get_mod_func(view)
-    try:
-'', ''
+{}, {}
-    except (ImportError, AttributeError):
-        raise Http404
@@ -236 +236 @@
-    templates = []
-    for site_settings_module in settings.ADMIN_FOR:
-'', ''
+{}, {}
-        if Site._meta.installed:
-            site_obj = Site.objects.get(pk=settings_mod.SITE_ID)

django/trunk/django/contrib/admin/views/template.py

@@ -15 +15 @@
-    settings_modules = {}
-    for mod in settings.ADMIN_FOR:
-'', ''
+{}, {}
-        settings_modules[settings_module.SITE_ID] = settings_module
-    manipulator = TemplateValidator(settings_modules)

django/trunk/django/contrib/auth/__init__.py

@@ -10 +10 @@
-    module, attr = path[:i], path[i+1:]
-    try:
-'', ''
+{}, {}
-    except ImportError, e:
-        raise ImproperlyConfigured, 'Error importing authentication backend %s: "%s"' % (module, e)

django/trunk/django/core/cache/__init__.py

@@ -49 +49 @@
-        host = host[:-1]
-
-'', ''
+{}, {}
-    return cache_class(host, params)
-

django/trunk/django/core/handlers/base.py

@@ -27 +27 @@
-            mw_module, mw_classname = middleware_path[:dot], middleware_path[dot+1:]
-            try:
-'', ''
+{}, {}
-            except ImportError, e:
-                raise exceptions.ImproperlyConfigured, 'Error importing middleware %s: "%s"' % (mw_module, e)

django/trunk/django/core/management.py

@@ -447 +447 @@
-    for app_name in settings.INSTALLED_APPS:
-        try:
-'', ''
+{}, {}
-        except ImportError:
-            pass
@@ -1231 +1231 @@
-    else:
-        test_module_name = '.'
-[],[],
+{}, {}, 
-    test_runner = getattr(test_module, test_path[-1])
-
@@ -1420 +1420 @@
-    project_name = os.path.basename(project_directory)
-    sys.path.append(os.path.join(project_directory, '..'))
-'', ''
+{}, {}
-    sys.path.pop()
-

django/trunk/django/core/serializers/__init__.py

@@ -30 +30 @@
-def register_serializer(format, serializer_module):
-    """Register a new serializer by passing in a module name."""
-'', ''
+{}, {}
-    _serializers[format] = module
-    

django/trunk/django/core/urlresolvers.py

@@ -120 +120 @@
-        mod_name, func_name = get_mod_func(self._callback_str)
-        try:
-'', ''
+{}, {}
-        except ImportError, e:
-            raise ViewDoesNotExist, "Could not import %s. Error was: %s" % (mod_name, str(e))
@@ -131 +131 @@
-        mod_name, func_name = get_mod_func(viewname)
-        try:
-'', ''
+{}, {}
-        except (ImportError, AttributeError):
-            raise NoReverseMatch
@@ -172 +172 @@
-        except AttributeError:
-            try:
-'', ''
+{}, {}
-            except ValueError, e:
-                # Invalid urlconf_name, such as "foo.bar." (note trailing period)
@@ -187 +187 @@
-        mod_name, func_name = get_mod_func(callback)
-        try:
-'', ''
+{}, {}
-        except (ImportError, AttributeError), e:
-            raise ViewDoesNotExist, "Tried %s. Error was: %s" % (callback, str(e))
@@ -201 +201 @@
-            mod_name, func_name = get_mod_func(lookup_view)
-            try:
-'', ''
+{}, {}
-            except (ImportError, AttributeError):
-                raise NoReverseMatch

django/trunk/django/db/__init__.py

@@ -9 +9 @@
-
-try:
-'', ''
+{}, {}
-except ImportError, e:
-    # The database backend wasn't found. Display a helpful error message
@@ -24 +24 @@
-        raise # If there's some other error, this must be an error in Django itself.
-
-'', ''
-'', ''
-'', ''
+{}, {}
+{}, {}
+{}, {}
-
-connection = backend.DatabaseWrapper()

django/trunk/django/db/models/loading.py

@@ -49 +49 @@
-    "Loads the app with the provided fully qualified name, and returns the model module."
-    global _app_list
-'', ''
+{}, {}
-    if not hasattr(mod, 'models'):
-        return None

django/trunk/django/template/context.py

@@ -70 +70 @@
-            module, attr = path[:i], path[i+1:]
-            try:
-'', ''
+{}, {}
-            except ImportError, e:
-                raise ImproperlyConfigured, 'Error importing request processor module %s: "%s"' % (module, e)

django/trunk/django/template/__init__.py

@@ -884 +884 @@
-    if not lib:
-        try:
-'', ''
+{}, {}
-        except ImportError, e:
-            raise InvalidTemplateLibrary, "Could not load template library from %s, %s" % (module_name, e)

django/trunk/django/template/loaders/app_directories.py

@@ -16 +16 @@
-    try:
-        if a is None:
-'', ''
+{}, {}
-        else:
-'', ''
+{}, {}
-    except ImportError, e:
-        raise ImproperlyConfigured, 'ImportError %s: %s' % (app, e.args[0])

django/trunk/django/templatetags/__init__.py

@@ -3 +3 @@
-for a in settings.INSTALLED_APPS:
-    try:
-'', ''
+{}, {}
-    except ImportError:
-        pass

django/trunk/django/test/simple.py

@@ -29 +29 @@
-    try:
-        app_path = app_module.__name__.split('.')[:-1]
-[], []
+{}, {}
-        
-        suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(test_module))

django/trunk/django/views/debug.py

@@ -76 +76 @@
-        for loader in template_source_loaders:
-            try:
-'', ''
+{}, {}
-                # NOTE: This assumes exc_value is the name of the template that
-                # the loader attempted to load.