Ticket #583: settings-v2.patch

django/conf/global_settings.py

@@ -52 +52 @@
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'
 
+# Should templates/ directories in the INSTALLED_APPS module-directories
+# be added to TEMPLATE_DIRS,
+ADD_APP_TEMPLATE_DIRS = False
+
 # List of locations of the template source files, in search order.
 TEMPLATE_DIRS = ()
 

django/conf/settings.py

@@ -44 +44 @@
             setting_value = (setting_value,) # In case the user forgot the comma.
         setattr(me, setting, setting_value)
 
+# Add templates/ directories from INSTALLED_APPS to TEMPLATE_DIRS,
+# [ Note -- There is a good reason i jump through these hoops, if the
+# original TEMPLATE_DIRS setting was a list-instance, we should keep it
+# that way. ]
+if me.ADD_APP_TEMPLATE_DIRS:
+    tds_type = type(me.TEMPLATE_DIRS)
+    tds = list(me.TEMPLATE_DIRS)
+    for app in me.INSTALLED_APPS:
+        m, a = app.rsplit('.', 1)
+        m = getattr(__import__(m, globals(), locals(), [a]), a)
+        app_root = os.path.dirname(m.__file__)
+        td = os.path.join(app_root, 'templates')
+        if os.path.isdir(td):
+            tds.append(td)
+    me.TEMPLATE_DIRS = tds_type(tds)
+
 # save DJANGO_SETTINGS_MODULE in case anyone in the future cares
 me.SETTINGS_MODULE = os.environ.get(ENVIRONMENT_VARIABLE, '')