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
This commit is contained in:
parent
d8fdf4d7ac
commit
242fc60520
|
@ -92,7 +92,7 @@ class Settings(object):
|
|||
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)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
# not empty to make SVN happy
|
|
@ -0,0 +1 @@
|
|||
# not empty to make SVN happy
|
|
@ -0,0 +1 @@
|
|||
# not empty to make SVN happy
|
|
@ -0,0 +1,3 @@
|
|||
INSTALLED_APPS = (
|
||||
'parent.*',
|
||||
)
|
|
@ -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
|
||||
|
||||
"""
|
||||
|
Loading…
Reference in New Issue