diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-18 01:08:34 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-18 01:08:34 +0000 |
| commit | 39c450cc6d71e2260994594d7ef42085e83f4fdd (patch) | |
| tree | a8a2151e03db256f61b9e4a7378889902a3102ea | |
| parent | 75b286798f07eea7f7edca6356e7fed1202f32c1 (diff) | |
Fixed #10526 -- More fixes when specifying installed apps using "foo.*".
This adds a case that was missed in r9925: underscore handling.
Backport of r10078 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6 files changed, 4 insertions, 5 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 785302c6fd..c980ee0b28 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -7,6 +7,7 @@ a list of all possible variables. """ import os +import re import time # Needed for Windows from django.conf import global_settings @@ -91,8 +92,9 @@ class Settings(object): appdir = os.path.dirname(__import__(app[:-2], {}, {}, ['']).__file__) app_subdirs = os.listdir(appdir) app_subdirs.sort() + name_pattern = re.compile(r'[a-zA-Z]\w*') for d in app_subdirs: - if d.isalnum() and d[0].isalpha() and os.path.isdir(os.path.join(appdir, d)): + if name_pattern.match(d) and os.path.isdir(os.path.join(appdir, d)): new_installed_apps.append('%s.%s' % (app[:-2], d)) else: new_installed_apps.append(app) diff --git a/tests/regressiontests/app_loading/parent/__init__.py b/tests/regressiontests/app_loading/parent/__init__.py index 51c842b5ba..e69de29bb2 100644 --- a/tests/regressiontests/app_loading/parent/__init__.py +++ b/tests/regressiontests/app_loading/parent/__init__.py @@ -1 +0,0 @@ -# not empty to make SVN happy diff --git a/tests/regressiontests/app_loading/parent/app/__init__.py b/tests/regressiontests/app_loading/parent/app/__init__.py index 51c842b5ba..e69de29bb2 100644 --- a/tests/regressiontests/app_loading/parent/app/__init__.py +++ b/tests/regressiontests/app_loading/parent/app/__init__.py @@ -1 +0,0 @@ -# not empty to make SVN happy diff --git a/tests/regressiontests/app_loading/parent/app1/__init__.py b/tests/regressiontests/app_loading/parent/app1/__init__.py index 51c842b5ba..e69de29bb2 100644 --- a/tests/regressiontests/app_loading/parent/app1/__init__.py +++ b/tests/regressiontests/app_loading/parent/app1/__init__.py @@ -1 +0,0 @@ -# not empty to make SVN happy diff --git a/tests/regressiontests/app_loading/parent/app_2/__init__.py b/tests/regressiontests/app_loading/parent/app_2/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/regressiontests/app_loading/parent/app_2/__init__.py diff --git a/tests/regressiontests/app_loading/tests.py b/tests/regressiontests/app_loading/tests.py index 444de10d79..bc958c0d88 100644 --- a/tests/regressiontests/app_loading/tests.py +++ b/tests/regressiontests/app_loading/tests.py @@ -14,7 +14,7 @@ Test the globbing of INSTALLED_APPS. >>> settings = Settings('test_settings') >>> settings.INSTALLED_APPS -['parent.app', 'parent.app1'] +['parent.app', 'parent.app1', 'parent.app_2'] >>> sys.path = old_sys_path |