[test] 2.4-ise test cases

[patchwork] / apps / settings.py

diff --git a/apps/settings.py b/apps/settings.py
index 8b33182de5c09ea9ead42a247d70bc179ff946f9..83aeeb4215a8fc15646cd22434c81635ea57b161 100644 (file)
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -94,6 +94,19 @@ INSTALLED_APPS = (
 )
 
 DEFAULT_PATCHES_PER_PAGE = 100
-PATCHWORK_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
+DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
 
 ACCOUNT_ACTIVATION_DAYS = 7
+
+# Set to True to enable the Patchwork XML-RPC interface
+ENABLE_XMLRPC = False
+
+try:
+    from local_settings import *
+except ImportError, ex:
+    import sys
+    sys.stderr.write(\
+            ("settings.py: error importing local settings file:\n" + \
+            "\t%s\n" + \
+            "Do you have a local_settings.py module?\n") % str(ex))
+    raise