Ticket #9323: 9323_r9208.diff

django/conf/__init__.py

@@ -113 +113 @@
                 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)

tests/regressiontests/app_loading/test_settings.py

@@ +1 @@
+INSTALLED_APPS = (
+    'parent.*',
+)

tests/regressiontests/app_loading/parent/app/__init__.py

@@ +1 @@
+# not empty to make SVN happy

tests/regressiontests/app_loading/parent/app1/__init__.py

@@ +1 @@
+# not empty to make SVN happy

tests/regressiontests/app_loading/parent/__init__.py

@@ +1 @@
+# not empty to make SVN happy

tests/regressiontests/app_loading/tests.py

@@ +1 @@
+"""
+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
+
+"""
+