summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-08-25 12:58:18 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-08-25 12:58:18 +0000
commit60d5f0db3c304ca8c10deaa24cddee20592b8656 (patch)
treebf75e4aa520f4024021f1e08328839207d6a98bd
parente206eabc68c6dbb018195291afd5722fe7493200 (diff)
Fixed #8242: handle `foo.*` consistantly in INSTALLED_APPS.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 558eec0c9d..fc69bed7c6 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -110,7 +110,9 @@ class Settings(object):
for app in self.INSTALLED_APPS:
if app.endswith('.*'):
appdir = os.path.dirname(__import__(app[:-2], {}, {}, ['']).__file__)
- for d in os.listdir(appdir):
+ 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)):
new_installed_apps.append('%s.%s' % (app[:-2], d))
else: