From 7872fc0dab2ad9971fb044b73ff33980aa4e7381 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 27 Nov 2011 20:13:37 +0000 Subject: Fixed #16247 -- Removed wildcard expansion of application names in INSTALLED_APPS. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17158 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/__init__.py | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'django') diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 3b829ce75b..8fff20248f 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -102,23 +102,6 @@ class Settings(BaseSettings): setting_value = (setting_value,) # In case the user forgot the comma. setattr(self, setting, setting_value) - # Expand entries in INSTALLED_APPS like "django.contrib.*" to a list - # of all those apps. - new_installed_apps = [] - for app in self.INSTALLED_APPS: - if app.endswith('.*'): - app_mod = importlib.import_module(app[:-2]) - appdir = os.path.dirname(app_mod.__file__) - app_subdirs = os.listdir(appdir) - app_subdirs.sort() - name_pattern = re.compile(r'[a-zA-Z]\w*') - for d in app_subdirs: - 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) - self.INSTALLED_APPS = new_installed_apps - if hasattr(time, 'tzset') and self.TIME_ZONE: # When we can, attempt to validate the timezone. If we can't find # this file, no check happens and it's harmless. -- cgit v1.3