Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #9323 -- Allow glob loading in INSTALLED_APPS to handle digits …

…in names.

Patch from carljm.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 242fc605209375425f25cdf591089d7804835606 1 parent d8fdf4d
@malcolmt malcolmt authored
View
2  django/conf/__init__.py
@@ -92,7 +92,7 @@ def __init__(self, settings_module):
app_subdirs = os.listdir(appdir)
app_subdirs.sort()
for d in app_subdirs:
- if d.isalpha() and os.path.isdir(os.path.join(appdir, d)):
+ if d.isalnum() and d[0].isalpha() and os.path.isdir(os.path.join(appdir, d)):
new_installed_apps.append('%s.%s' % (app[:-2], d))
else:
new_installed_apps.append(app)
View
0  tests/regressiontests/app_loading/__init__.py
No changes.
View
0  tests/regressiontests/app_loading/models.py
No changes.
View
1  tests/regressiontests/app_loading/parent/__init__.py
@@ -0,0 +1 @@
+# not empty to make SVN happy
View
1  tests/regressiontests/app_loading/parent/app/__init__.py
@@ -0,0 +1 @@
+# not empty to make SVN happy
View
1  tests/regressiontests/app_loading/parent/app1/__init__.py
@@ -0,0 +1 @@
+# not empty to make SVN happy
View
3  tests/regressiontests/app_loading/test_settings.py
@@ -0,0 +1,3 @@
+INSTALLED_APPS = (
+ 'parent.*',
+)
View
18 tests/regressiontests/app_loading/tests.py
@@ -0,0 +1,18 @@
+"""
+Test the globbing of INSTALLED_APPS.
+
+>>> import os, sys
+>>> old_sys_path = sys.path
+>>> sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+>>> from django.conf import Settings
+
+>>> s = Settings('test_settings')
+
+>>> s.INSTALLED_APPS
+['parent.app', 'parent.app1']
+
+>>> sys.path = old_sys_path
+
+"""
+
Please sign in to comment.
Something went wrong with that request. Please try again.