Merge lp:~lukasz-czyzykowski/django-configglue/django-1.4 into lp:django-configglue

[Łukasz Czyżykowski]

Django 1.4 compatibility.

Overview
========
Updated code to work against Django 1.4. On the way there dropped support for anything earlier than Django 1.3. Schemas for them still exist in the codebase, but are not registered.

[Ricardo Kirkner (ricardokirkner)]

l. 515,581: this should probably be at the start of the setUp method
l. 551,562: instead you could use the addCleanup idiom which is nicer than having to store this
l. 573,693: why mixing stdout and stderr?
l. 989: remove commented out code

Also tests are currently not passing when running them like 'python setup.py test'. I have django 1.4.1 as a system package. If tests require a specific django version (like 1.4.5, it should be specified in setup.py).

review: Needs Fixing

[lp:~lukasz-czyzykowski/django-configglue/django-1.4]

96. By Łukasz Czyżykowski on 2013-03-12

MP reviews comment updates.

97. By Łukasz Czyżykowski on 2013-03-12

Updated setup.py to point to the earliest supported version.

[Łukasz Czyżykowski (lukasz-czyzykowski)]

l. 515,581: done
l. 551,562: it has to be done around the settings reload, and before clean up, as otherwise tearDown will fail
l. 573,693: because django 1.3 prints the help message to stderr, 1.4 to stdout so to test on both, we need to mix them
l. 989: done

The 1.4.5 is specified in tox.ini, but updated setup.py to point to the 1.3.7 as the version officially supported.

[lp:~lukasz-czyzykowski/django-configglue/django-1.4]

98. By Łukasz Czyżykowski on 2013-03-12

Moved super call to the top of setUp method.

99. By Łukasz Czyżykowski on 2013-03-12

Added code to handle django versions before 1.4.5

100. By Łukasz Czyżykowski on 2013-03-14

Added testenv for django 1.4.1

101. By Łukasz Czyżykowski on 2013-03-14

Fixed super call in setUp.

102. By Łukasz Czyżykowski on 2013-03-14

Fixed small issue in assert_schema_structure.

103. By Łukasz Czyżykowski on 2013-03-14

Properly rearranged schemas to include base one for Django 1.3 and 1.4.

104. By Łukasz Czyżykowski on 2013-03-14

Fixed test for schma by generating new versions.

105. By Łukasz Czyżykowski on 2013-03-14

Fixed test generation test.

106. By Łukasz Czyżykowski on 2013-03-14

Fixed test for Django 1.3.*

107. By Łukasz Czyżykowski on 2013-03-14

Fixed tests on all version.

108. By Łukasz Czyżykowski on 2013-03-22

essage=Changed the way in which version is used in schema building.

[Ricardo Kirkner (ricardokirkner)]

Great stuff! Thanks

review: Approve

=== modified file 'django_configglue/management/__init__.py'
--- django_configglue/management/__init__.py	2012-10-15 14:30:11 +0000
+++ django_configglue/management/__init__.py	2013-03-22 14:01:30 +0000
@@ -4,16 +4,16 @@
 # GNU Lesser General Public License version 3 (see the file LICENSE)
 # except where third-party/django/LICENSE applies.
 
-
 from optparse import BadOptionError
-import sys
-
-import django
-import django.core.management
+
+from django.core import management
+from django.core.management import (
+    ManagementUtility,
+    LaxOptionParser as _LaxOptionParser,
+)
+from django.conf import settings
+
 from configglue.glue import schemaconfigglue
-from django.core.management import ManagementUtility, LaxOptionParser as _LaxOptionParser
-from django.core.management.base import BaseCommand, handle_default_options
-from django.conf import settings
 from django_configglue import utils
 
 
@@ -86,4 +86,4 @@
 
 
 # We're going to go ahead and use our own ManagementUtility here, thank you.
-django.core.management.ManagementUtility = GlueManagementUtility
+management.ManagementUtility = GlueManagementUtility

=== modified file 'django_configglue/schema.py'
--- django_configglue/schema.py	2013-02-20 08:51:07 +0000
+++ django_configglue/schema.py	2013-03-22 14:01:30 +0000
@@ -13,10 +13,10 @@
     StringOption,
     TupleOption,
 )
-from django import get_version
+from django import get_version, VERSION
 from django.conf import global_settings
-from django.conf.project_template import settings as project_settings
 
+from django_configglue.utils import get_project_settings
 
 # As in django.conf.global_settings:
 # This is defined here as a do-nothing function because we can't import
@@ -446,23 +446,6 @@
             help="The profanities that will trigger a validation error in the "
                  "'hasNoProfanities' validator. All of these should be in "
                  "lowercase")
-        comments_banned_users_group = StringOption(null=True,
-            help="The group ID that designates which users are banned. "
-                 "Set to None if you're not using it")
-        comments_moderators_group = StringOption(null=True,
-            help="The group ID that designates which users can moderate "
-                 "comments. Set to None if you're not using it")
-        comments_sketchy_users_group = StringOption(null=True,
-            help="The group ID that designates the users whose comments "
-                 "should be e-mailed to MANAGERS. Set to None if you're not "
-                 "using it")
-        comments_first_few = IntOption(default=0,
-            help="The system will e-mail MANAGERS the first "
-                 "COMMENTS_FIRST_FEW comments by each user. Set this to 0 if "
-                 "you want to disable it")
-        banned_ips = TupleOption(
-            help="A tuple of IP addresses that have been banned from "
-                 "participating in various Django-powered features")
 
         ##################
         # AUTHENTICATION #
@@ -873,19 +856,16 @@
 
 
 Django13Base = derivate_django_schema(
-    Django12Schema, exclude=['cache_backend'])
+    Django12Schema,
+    exclude=[
+        'cache_backend',
+    ])
 
 
 class Django13Schema(Django13Base):
     version = '1.3'
 
-    # sections
     class django(Django13Base.django):
-
-        ################
-        # CORE         #
-        ################
-
         # update default value
         languages = ListOption(
             item=TupleOption(length=2),
@@ -1025,6 +1005,27 @@
             help="The profanities that will trigger a validation error in the "
                  "'hasNoProfanities' validator. All of these should be in "
                  "lowercase")
+        comments_banned_users_group = StringOption(
+            null=True,
+            help="The group ID that designates which users are banned. "
+                 "Set to None if you're not using it")
+        comments_moderators_group = StringOption(
+            null=True,
+            help="The group ID that designates which users can moderate "
+                 "comments. Set to None if you're not using it")
+        comments_sketchy_users_group = StringOption(
+            null=True,
+            help="The group ID that designates the users whose comments "
+                 "should be e-mailed to MANAGERS. Set to None if you're not "
+                 "using it")
+        comments_first_few = IntOption(
+            default=0,
+            help="The system will e-mail MANAGERS the first "
+                 "COMMENTS_FIRST_FEW comments by each user. Set this to 0 if "
+                 "you want to disable it")
+        banned_ips = TupleOption(
+            help="A tuple of IP addresses that have been banned from "
+            "participating in various Django-powered features")
 
         ###########
         # LOGGING #
@@ -1115,11 +1116,50 @@
                  "Examples: 'htttp://foo.com/media/', '/media/'")
 
 
-class Django14Schema(Django13Schema):
+class Django136Schema(Django13Schema):
+    version = '1.3.6'
+
+    class django(Django13Schema.django):
+
+        allowed_hosts = ListOption(
+            item=StringOption(),
+            help="A list of strings representing the host/domain names "
+                 "that this Django site can serve. This is a security "
+                 "measure to prevent an attacker from poisoning caches and "
+                 "password reset emails with links to malicious hosts by "
+                 "submitting requests with a fake HTTP Host header, which is "
+                 "possible even under many seemingly-safe webserver "
+                 "configurations.")
+
+
+Django14Base = derivate_django_schema(
+    Django13Schema,
+    exclude=[
+        'admin_media_prefix',
+        'ignorable_404_starts',
+        'ignorable_404_ends',
+        'banned_ips',
+        'comments_banned_users_group',
+        'comments_moderators_group',
+        'comments_sketchy_users_group',
+        'comments_first_few',
+        'database_engine',
+        'database_host',
+        'database_name',
+        'database_options',
+        'database_password',
+        'database_port',
+        'database_user',
+        'test_database_charset',
+        'test_database_collation',
+        'test_database_name',
+    ])
+
+
+class Django14Schema(Django14Base):
     version = '1.4'
 
-    #sections
-    class django(Django13Schema.django):
+    class django(Django14Base.django):
 
         wsgi_application = StringOption(
             help="The full Python path of the WSGI application object"
@@ -1140,6 +1180,7 @@
 
         secure_proxy_ssl_header = TupleOption(
             length=2,
+            default=None,
             help="A tuple representing a HTTP header/value combination "
                  "that signifies a request is secure. This controls the "
                  "behavior of the request object's is_secure() method.")
@@ -1153,6 +1194,252 @@
                  "as favicon.ico or robots.txt, or if it gets hammered by "
                  "script kiddies.")
 
+        password_hashers = ListOption(
+            item=StringOption(),
+            help="This is a list of hashing algorithm classes that this "
+                 "Django installation supports. The first entry in this list "
+                 "(that is, settings.PASSWORD_HASHERS[0]) will be used to "
+                 "store passwords, and all the other entries are valid "
+                 "hashers that can be used to check existing passwords.",
+            default=[
+                'django.contrib.auth.hashers.PBKDF2PasswordHasher',
+                'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+                'django.contrib.auth.hashers.BCryptPasswordHasher',
+                'django.contrib.auth.hashers.SHA1PasswordHasher',
+                'django.contrib.auth.hashers.MD5PasswordHasher',
+                'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
+                'django.contrib.auth.hashers.CryptPasswordHasher',
+                ]
+            )
+
+        x_frame_options = StringOption(
+            default='SAMEORIGIN',
+            help="The default value for the X-Frame-Options header used "
+                 "by XFrameOptionsMiddleware.")
+
+        use_tz = BoolOption(
+            default=True,
+            help="A boolean that specifies if datetimes will be timezone-aware"
+                 " by default or not. If this is set to True, Django will use "
+                 "timezone-aware datetimes internally. Otherwise, Django will "
+                 "use naive datetimes in local time.")
+
+        default_exception_reporter_filter = StringOption(
+            default='django.views.debug.SafeExceptionReporterFilter',
+            help="Default exception reporter filter class to be used if none "
+                 "has been assigned to the HttpRequest instance yet.")
+
+        signing_backend = StringOption(
+            default='django.core.signing.TimestampSigner',
+            help="The backend used for signing cookies and other data.")
+
+        url_validator_user_agent = StringOption(
+            default=("Django/%s (https://www.djangoproject.com)" %
+                     get_version()),
+            help="The User-Agent string to use when checking for URL validity "
+                 "through the isExistingURL validator")
+
+        message_storage = StringOption(
+            default='django.contrib.messages.storage.fallback.'
+                'FallbackStorage',
+            help="Class to be used as messages backend")
+
+
+        logging = DictOption(
+            spec={
+                'version': IntOption(default=1),
+                'formatters': DictOption(
+                    item=DictOption(
+                        spec={
+                            'format': StringOption(null=True),
+                            'datefmt': StringOption(null=True)})),
+                'filters': DictOption(
+                    item=DictOption(
+                        spec={'name': StringOption()})),
+                'handlers': DictOption(
+                    item=DictOption(
+                        spec={
+                            'class': StringOption(fatal=True),
+                            'level': StringOption(),
+                            'formatter': StringOption(),
+                            'filters': StringOption()})),
+                'loggers': DictOption(
+                    item=DictOption(
+                        spec={
+                            'level': StringOption(),
+                            'propagate': BoolOption(),
+                            'filters': ListOption(item=StringOption()),
+                            'handlers': ListOption(item=StringOption()),
+                            })),
+                'root': DictOption(
+                    spec={
+                        'level': StringOption(),
+                        'filters': ListOption(item=StringOption()),
+                        'handlers': ListOption(item=StringOption()),
+                        }),
+                'incremental': BoolOption(default=False),
+                'disable_existing_loggers': BoolOption(default=False),
+            },
+            default={
+                'version': 1,
+                'disable_existing_loggers': False,
+                'filters': {
+                    'require_debug_false': {
+                        '()': 'django.utils.log.RequireDebugFalse',
+                    }
+                },
+                'handlers': {
+                    'mail_admins': {
+                       'level': 'ERROR',
+                       'filters': ['require_debug_false'],
+                       'class': 'django.utils.log.AdminEmailHandler'
+                    }
+                },
+                'loggers': {
+                    'django.request': {
+                        'handlers': ['mail_admins'],
+                        'level': 'ERROR',
+                        'propagate': True,
+                    },
+                }
+            },
+            help="The default logging configuration. This sends an email to "
+                 "the site admins on every HTTP 500 error. All other records "
+                 "are sent to the bit bucket.")
+
+        template_context_processors = ListOption(
+            item=StringOption(),
+            default=['django.contrib.auth.context_processors.auth',
+                     'django.core.context_processors.debug',
+                     'django.core.context_processors.i18n',
+                     'django.core.context_processors.media',
+                     'django.core.context_processors.static',
+                     'django.core.context_processors.tz',
+                     'django.contrib.messages.context_processors.messages',
+                     ],
+            help="List of processors used by RequestContext to populate the "
+                 "context. Each one should be a callable that takes the "
+                 "request object as its only parameter and returns a "
+                 "dictionary to add to the context")
+
+        languages = ListOption(
+            item=TupleOption(length=2),
+            default=[
+                ('ar', gettext_noop('Arabic')),
+                ('az', gettext_noop('Azerbaijani')),
+                ('bg', gettext_noop('Bulgarian')),
+                ('bn', gettext_noop('Bengali')),
+                ('bs', gettext_noop('Bosnian')),
+                ('ca', gettext_noop('Catalan')),
+                ('cs', gettext_noop('Czech')),
+                ('cy', gettext_noop('Welsh')),
+                ('da', gettext_noop('Danish')),
+                ('de', gettext_noop('German')),
+                ('el', gettext_noop('Greek')),
+                ('en', gettext_noop('English')),
+                ('en-gb', gettext_noop('British English')),
+                ('eo', gettext_noop('Esperanto')),
+                ('es', gettext_noop('Spanish')),
+                ('es-ar', gettext_noop('Argentinian Spanish')),
+                ('es-mx', gettext_noop('Mexican Spanish')),
+                ('es-ni', gettext_noop('Nicaraguan Spanish')),
+                ('et', gettext_noop('Estonian')),
+                ('eu', gettext_noop('Basque')),
+                ('fa', gettext_noop('Persian')),
+                ('fi', gettext_noop('Finnish')),
+                ('fr', gettext_noop('French')),
+                ('fy-nl', gettext_noop('Frisian')),
+                ('ga', gettext_noop('Irish')),
+                ('gl', gettext_noop('Galician')),
+                ('he', gettext_noop('Hebrew')),
+                ('hi', gettext_noop('Hindi')),
+                ('hr', gettext_noop('Croatian')),
+                ('hu', gettext_noop('Hungarian')),
+                ('id', gettext_noop('Indonesian')),
+                ('is', gettext_noop('Icelandic')),
+                ('it', gettext_noop('Italian')),
+                ('ja', gettext_noop('Japanese')),
+                ('ka', gettext_noop('Georgian')),
+                ('kk', gettext_noop('Kazakh')),
+                ('km', gettext_noop('Khmer')),
+                ('kn', gettext_noop('Kannada')),
+                ('ko', gettext_noop('Korean')),
+                ('lt', gettext_noop('Lithuanian')),
+                ('lv', gettext_noop('Latvian')),
+                ('mk', gettext_noop('Macedonian')),
+                ('ml', gettext_noop('Malayalam')),
+                ('mn', gettext_noop('Mongolian')),
+                ('nb', gettext_noop('Norwegian Bokmal')),
+                ('ne', gettext_noop('Nepali')),
+                ('nl', gettext_noop('Dutch')),
+                ('nn', gettext_noop('Norwegian Nynorsk')),
+                ('pa', gettext_noop('Punjabi')),
+                ('pl', gettext_noop('Polish')),
+                ('pt', gettext_noop('Portuguese')),
+                ('pt-br', gettext_noop('Brazilian Portuguese')),
+                ('ro', gettext_noop('Romanian')),
+                ('ru', gettext_noop('Russian')),
+                ('sk', gettext_noop('Slovak')),
+                ('sl', gettext_noop('Slovenian')),
+                ('sq', gettext_noop('Albanian')),
+                ('sr', gettext_noop('Serbian')),
+                ('sr-latn', gettext_noop('Serbian Latin')),
+                ('sv', gettext_noop('Swedish')),
+                ('sw', gettext_noop('Swahili')),
+                ('ta', gettext_noop('Tamil')),
+                ('te', gettext_noop('Telugu')),
+                ('th', gettext_noop('Thai')),
+                ('tr', gettext_noop('Turkish')),
+                ('tt', gettext_noop('Tatar')),
+                ('uk', gettext_noop('Ukrainian')),
+                ('ur', gettext_noop('Urdu')),
+                ('vi', gettext_noop('Vietnamese')),
+                ('zh-cn', gettext_noop('Simplified Chinese')),
+                ('zh-tw', gettext_noop('Traditional Chinese'))],
+            help="Languages we provide translations for, out of the box. "
+                 "The language name should be the utf-8 encoded local name "
+                 "for the language")
+
+        session_cookie_httponly = BoolOption(
+            default=True,
+            help="Whether to use the non-RFC standard htt pOnly flag (IE, "
+                 "FF3+, others)")
+
+        datetime_input_formats = ListOption(
+            item=StringOption(),
+            default=[
+                '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+                '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
+                '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
+                '%Y-%m-%d',              # '2006-10-25'
+                '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
+                '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
+                '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
+                '%m/%d/%Y',              # '10/25/2006'
+                '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
+                '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
+                '%m/%d/%y %H:%M',        # '10/25/06 14:30'
+                '%m/%d/%y',              # '10/25/06'
+            ],
+            help="Default formats to be used when parsing dates and times "
+                "from input boxes, in order")
+
+
+class Django144Schema(Django14Schema):
+    version = '1.4.4'
+
+    class django(Django14Schema.django):
+
+        allowed_hosts = ListOption(
+            item=StringOption(),
+            help="A list of strings representing the host/domain names "
+                 "that this Django site can serve. This is a security "
+                 "measure to prevent an attacker from poisoning caches and "
+                 "password reset emails with links to malicious hosts by "
+                 "submitting requests with a fake HTTP Host header, which is "
+                 "possible even under many seemingly-safe webserver "
+                 "configurations.")
+
 
 class DjangoSchemaFactory(object):
     def __init__(self):
@@ -1172,6 +1459,7 @@
             return self._schemas[version]
 
         msg = "No schema registered for version %r" % version
+
         if strict:
             raise ValueError(msg)
         else:
@@ -1181,10 +1469,14 @@
         schema = self.build(version)
         return schema
 
-    def build(self, version_string=None, options=None):
+    def build(self, version_string=None, options=None,
+              BaseSchema=BaseDjangoSchema):
         if version_string is None:
             version_string = get_version()
+
         if options is None:
+            project_settings = get_project_settings()
+
             options = dict([(name.lower(), value) for (name, value) in
                 inspect.getmembers(global_settings) if name.isupper()])
             project_options = dict([(name.lower(), value) for (name, value) in
@@ -1197,10 +1489,18 @@
 
             options.update(project_options)
 
-        class DjangoSchema(Schema):
+        try:
+            base_version = '{0}.{1}'.format(*VERSION[:2])
+            BaseSchema = self.get(base_version)
+        except ValueError:
+            pass
+
+        section_base_class = getattr(BaseSchema, 'django', Section)
+
+        class DjangoSchema(BaseSchema):
             version = version_string
 
-            class django(Section):
+            class django(section_base_class):
                 pass
 
         def get_option_type(name, value):
@@ -1214,8 +1514,18 @@
                 unicode: StringOption,
             }
             if value is None:
+                # Special casing strange value, which by default is None but
+                # should be set to tuple.
+                if name == 'secure_proxy_ssl_header':
+                    return TupleOption(name=name, default=None)
+
                 return StringOption(name=name, default=value, null=True)
             else:
+                # Clean up values comming from the project template and having
+                # {{ }} substitutions in them.
+                if name in ('secret_key', 'wsgi_application'):
+                    value = ''
+
                 option_type = type_mappings[type(value)]
                 kwargs = {'name': name, 'default': value}
 
@@ -1246,8 +1556,9 @@
         for name, value in options.items():
             if name == '__CONFIGGLUE_PARSER__':
                 continue
-            option = get_option_type(name, value)
-            setattr(DjangoSchema.django, name, option)
+            if not hasattr(DjangoSchema.django, name):
+                option = get_option_type(name, value)
+                setattr(DjangoSchema.django, name, option)
 
         # register schema for it to be available during next query
         self.register(DjangoSchema, version_string)
@@ -1256,14 +1567,9 @@
 
 schemas = DjangoSchemaFactory()
 schemas.register(BaseDjangoSchema)
-schemas.register(BaseDjangoSchema, '1.0.4')
-schemas.register(Django11Schema)
-schemas.register(Django11Schema, '1.1.2')
-schemas.register(Django11Schema, '1.1.4')
-schemas.register(Django12Schema)
-schemas.register(Django12Schema, '1.2.7')
 schemas.register(Django13Schema)
-for i in range(1, 6):
-    schemas.register(Django13Schema, '1.3.%d' % i)
+schemas.register(Django136Schema)
+schemas.register(Django136Schema, '1.3.7')
 schemas.register(Django14Schema)
-schemas.register(Django14Schema, '1.4.3')
+schemas.register(Django144Schema)
+schemas.register(Django144Schema, '1.4.5')

=== modified file 'django_configglue/tests/helpers.py'
--- django_configglue/tests/helpers.py	2011-08-05 16:12:53 +0000
+++ django_configglue/tests/helpers.py	2013-03-22 14:01:30 +0000
@@ -11,6 +11,10 @@
 from django.core import management
 from django.conf import settings
 from django.test import TestCase
+try:
+    from django.utils.functional import empty
+except ImportError:
+    empty = None
 
 from configglue.schema import (
     ListOption,
@@ -23,31 +27,25 @@
     COMMAND = ''
 
     def setUp(self):
+        super(ConfigGlueDjangoCommandTestCase, self).setUp()
         # disable logging during tests
         self.level = logging.getLogger().level
         logging.disable(logging.ERROR)
 
         config = textwrap.dedent("""
             [django]
-            database_engine = sqlite3
-            database_name = :memory:
             installed_apps = django_configglue
             time_zone = Europe/London
+            databases = databases
+
+            [databases]
+            default = db_default
+
+            [db_default]
+            engine = django.db.backends.sqlite3
+            name = :memory:
         """)
 
-        if django.VERSION[:2] > (1, 1):
-            # since 1.2 use multi database settings format
-            config += textwrap.dedent("""
-                databases = databases
-
-                [databases]
-                default = db_default
-
-                [db_default]
-                engine = sqlite3
-                name = :memory:
-            """)
-
         self.set_config(config)
         self._DJANGO_SETTINGS_MODULE = self.load_settings()
 
@@ -60,6 +58,7 @@
                          self._DJANGO_SETTINGS_MODULE)
 
         os.remove('test.cfg')
+        super(ConfigGlueDjangoCommandTestCase, self).tearDown()
 
     def set_config(self, config):
         config_file = open('test.cfg', 'w')
@@ -68,14 +67,11 @@
 
     @property
     def wrapped_settings(self):
-        wrapped = '_target'
-        if django.VERSION[:3] > (1, 0, 2):
-            wrapped = '_wrapped'
         # make sure the wrapped object is not None
         # by just querying it for a setting
         getattr(settings, 'DEBUG', False)
-        assert(getattr(settings, wrapped) != None)
-        return wrapped
+        assert(getattr(settings, '_wrapped') is not empty)
+        return '_wrapped'
 
     def load_settings(self, module='django_configglue.tests.settings'):
         old_module = os.environ['DJANGO_SETTINGS_MODULE']
@@ -90,8 +86,12 @@
                 'DATABASE_SUPPORTS_TRANSACTIONS': getattr(
                     settings, 'DATABASE_SUPPORTS_TRANSACTIONS'),
             }
+        # save _original_allowed_hosts so that the teardown will work
+        # properly
+        _original_allowed_hosts = getattr(
+            settings, '_original_allowed_hosts', None)
         # force django to reload its settings
-        setattr(settings, self.wrapped_settings, None)
+        setattr(settings, self.wrapped_settings, empty)
         # update settings module for next reload
         os.environ['DJANGO_SETTINGS_MODULE'] = module
 
@@ -99,6 +99,8 @@
         for key, value in extra_settings.items():
             setattr(settings, key, value)
 
+        settings._original_allowed_hosts = _original_allowed_hosts
+
         if hasattr(self, 'extra_settings'):
             for key, value in self.extra_settings.items():
                 setattr(settings, key, value)
@@ -119,8 +121,7 @@
         sys.stdout.seek(0)
         sys.stderr.seek(0)
 
-        self.capture = {'stdout': sys.stdout.read(),
-                        'stderr': sys.stderr.read()}
+        self.output = sys.stdout.read() + sys.stderr.read()
 
         sys.stdout = self._stdout
         sys.stderr = self._stderr
@@ -135,6 +136,7 @@
 
 class SchemaHelperTestCase(TestCase):
     def setUp(self):
+        super(SchemaHelperTestCase, self).setUp()
         # disable logging during tests
         self.level = logging.getLogger().level
         logging.disable(logging.ERROR)
@@ -142,10 +144,11 @@
     def tearDown(self):
         # re-enable logging
         logging.getLogger().setLevel(self.level)
+        super(SchemaHelperTestCase, self).tearDown()
 
     def assert_schema_structure(self, schema_cls, version, options):
         self.assertTrue(issubclass(schema_cls, Schema))
-        self.assertEqual(schema_cls.version, 'bogus')
+        self.assertEqual(schema_cls.version, version)
 
         schema = schema_cls()
 
@@ -187,8 +190,11 @@
             # django defaults to tuples for options it defines as lists
             if (isinstance(option, (ListOption, TupleOption)) or
                     isinstance(expected_option, (ListOption, TupleOption))):
-                self.assertEqual(list(option.default),
-                    list(expected_option.default))
+                if option.default is None:
+                    self.assertIsNone(expected_option.default)
+                else:
+                    self.assertEqual(list(option.default),
+                                     list(expected_option.default))
             else:
                 self.assertEqual(option.default,
                     expected_option.default)

=== modified file 'django_configglue/tests/settings.py'
--- django_configglue/tests/settings.py	2011-07-19 01:24:06 +0000
+++ django_configglue/tests/settings.py	2013-03-22 14:01:30 +0000
@@ -10,9 +10,9 @@
 
 version = DjangoSchema.version
 main_cfg = 'main.cfg'
-if version >= '1.3':
+if version >= '1.4':
+    main_cfg = 'main-14.cfg'
+elif version >= '1.3':
     main_cfg = 'main-13.cfg'
-elif version >= '1.2':
-    main_cfg = 'main-12.cfg'
 
 configglue(DjangoSchema, [main_cfg, 'test.cfg'], __name__)

=== modified file 'django_configglue/tests/test_configglue.py'
--- django_configglue/tests/test_configglue.py	2013-02-20 08:51:07 +0000
+++ django_configglue/tests/test_configglue.py	2013-03-22 14:01:30 +0000
@@ -25,7 +25,6 @@
 )
 from django.conf import settings
 from django.conf import global_settings
-from django.conf.project_template import settings as project_settings
 from mock import patch
 
 from django_configglue.management import GlueManagementUtility, LaxOptionParser
@@ -34,6 +33,7 @@
     configglue,
     get_django_settings,
     update_settings,
+    get_project_settings,
 )
 from django_configglue.schema import (
     BaseDjangoSchema,
@@ -100,11 +100,11 @@
         self.assertRaises(ValueError, schemas.get, '1.1.1', strict=True)
 
     def test_schema_versions(self):
-        django_10 = schemas.get('1.0')()
-        django_11 = schemas.get('1.1')()
-        self.assertEqual(django_10.version, '1.0')
-        self.assertEqual(django_11.version, '1.1')
-        self.assertFalse(django_10 is django_11)
+        django_13 = schemas.get('1.3')()
+        django_14 = schemas.get('1.4')()
+        self.assertEqual(django_13.version, '1.3')
+        self.assertEqual(django_14.version, '1.4')
+        self.assertFalse(django_13 is django_14)
 
     def test_register_without_version(self):
         class MySchema(Schema):
@@ -156,10 +156,10 @@
             (StringOption, 'foo'),
         ]
 
-        for opt_type, default in data:
-            schema_cls = schemas.build('bogus', {'foo': default})
+        for i, (opt_type, default) in enumerate(data):
+            schema_cls = schemas.build('bogus.%d' % i, {'foo': default}, Schema)
             # do common checks
-            self.assert_schema_structure(schema_cls, 'bogus',
+            self.assert_schema_structure(schema_cls, 'bogus.%d' % i,
                 {'foo': opt_type(name='foo', default=default)})
 
     def test_schemafactory_build_django(self):
@@ -231,7 +231,7 @@
         options = dict([(name.lower(), value) for (name, value) in
             inspect.getmembers(global_settings) if name.isupper()])
         project_options = dict([(name.lower(), value) for (name, value) in
-            inspect.getmembers(project_settings) if name.isupper()])
+            inspect.getmembers(get_project_settings()) if name.isupper()])
         # handle special case of ROOT_URLCONF which depends on the
         # project name
         root_urlconf = project_options['root_urlconf'].replace(
@@ -353,38 +353,52 @@
 
     def test_execute_no_args(self):
         self.util.argv = ['']
-        self.assertRaises(SystemExit, self.execute)
+        try:
+            self.execute()
+        except SystemExit:
+            pass
         self.assertTrue(
             "Type '%s help <subcommand>' for help" % (self.util.prog_name,) in
-            self.capture['stderr'])
+            self.output)
 
-    def test_execute_help(self):
+    @patch('sys.stdout')
+    def test_execute_help(self, mock_stdout):
+        mock_stdout.isatty.return_value = False
         self.util.argv = ['', 'help']
-        self.assertRaises(SystemExit, self.execute)
-        self.assertTrue(self.util.main_help_text() in self.capture['stderr'])
+        try:
+            self.execute()
+        except SystemExit:
+            # In earlier versions than 1.4, help was raising SystemExit
+            pass
+        self.assertTrue(self.util.main_help_text() in self.output)
 
-    def test_execute_help_option(self):
+    @patch('sys.stdout')
+    def test_execute_help_option(self, mock_stdout):
+        mock_stdout.isatty.return_value = False
         self.util.argv = ['', '--help']
         self.execute()
-        self.assertTrue(self.util.main_help_text() in self.capture['stderr'])
+        self.assertTrue(self.util.main_help_text() in self.output)
 
     def test_execute_help_for_command(self):
         self.util.argv = ['', 'help', 'settings']
         self.execute()
-        self.assertTrue('Show settings attributes' in self.capture['stdout'])
+        self.assertTrue('Show settings attributes' in self.output)
 
     def test_execute_version(self):
         from django import get_version
         self.util.argv = ['', '--version']
         self.execute()
-        self.assertTrue(get_version() in self.capture['stdout'])
+        self.assertTrue(get_version() in self.output)
 
     def test_execute(self):
         self.util.argv = ['', 'settings']
         self.execute()
-        self.assertTrue('Show settings attributes' in self.capture['stdout'])
-
-    def test_execute_settings_exception(self):
+        self.assertTrue('Show settings attributes' in self.output)
+
+    @patch('sys.stdout')
+    def test_execute_settings_exception(self, mock_stdout):
+        mock_stdout.isatty.return_value = False
+
         from django.conf import settings
         wrapped = getattr(settings, self.wrapped_settings)
         old_CONFIGGLUE_PARSER = wrapped.__CONFIGGLUE_PARSER__
@@ -392,16 +406,19 @@
 
         try:
             self.util.argv = ['', 'help']
-            self.assertRaises(SystemExit, self.execute)
+            try:
+                self.execute()
+            except SystemExit:
+                pass
             self.assertTrue(
-                self.util.main_help_text() in self.capture['stderr'])
+                self.util.main_help_text() in self.output)
         finally:
             wrapped.__CONFIGGLUE_PARSER__ = old_CONFIGGLUE_PARSER
 
     def test_execute_with_schema_options(self):
         self.util.argv = ['', '--django_debug=False', 'help', 'settings']
         self.execute()
-        self.assertTrue('Show settings attributes' in self.capture['stdout'])
+        self.assertTrue('Show settings attributes' in self.output)
 
     def test_verbosity_is_preserved(self):
         self.util.argv = ['', 'settings', '--verbosity=2']

=== modified file 'django_configglue/tests/test_settings.py'
--- django_configglue/tests/test_settings.py	2012-10-15 14:21:03 +0000
+++ django_configglue/tests/test_settings.py	2013-03-22 14:01:30 +0000
@@ -23,30 +23,27 @@
 
     def test_no_args(self):
         self.call_command()
-        self.assertTrue(self.capture['stdout'].startswith('Usage: '))
+        self.assertTrue(self.output.startswith('Usage: '))
 
     def test_get(self):
         self.call_command('installed_apps')
         expected_output = "INSTALLED_APPS = ['django_configglue']"
-        self.assertEqual(self.capture['stdout'].strip(), expected_output)
+        self.assertEqual(self.output.strip(), expected_output)
 
     def test_get_not_found(self):
         self.call_command('bogus')
         expected_output = "setting BOGUS not found"
-        self.assertEqual(self.capture['stdout'].strip(), expected_output)
+        self.assertEqual(self.output.strip(), expected_output)
 
     def test_show(self):
         expected_values = [
+            'SITE_ID = 1',
+            "SETTINGS_MODULE = 'django_configglue.tests.settings'",
             "ROOT_URLCONF = 'urls'",
-            "SITE_ID = 1",
-            "SETTINGS_MODULE = 'django_configglue.tests.settings'",
             "SETTINGS_ENCODING = '%s'" % SETTINGS_ENCODING,
         ]
-        django_version = django.VERSION[:2]
-        if django_version == (1, 1):
-            expected_values.append("DATABASE_SUPPORTS_TRANSACTIONS = True")
         self.call_command(show_current=True)
-        output_lines = self.capture['stdout'].strip().split('\n')
+        output_lines = self.output.strip().split('\n')
         self.assertEqual(set(expected_values), set(output_lines))
 
     def test_show_global(self):
@@ -55,7 +52,7 @@
             dir(settings) if self.is_setting(key)])
         # process output into dictionary
         items = map(lambda x: x.split(' = '),
-                    self.capture['stdout'].strip().split('\n'))
+                    self.output.strip().split('\n'))
         items = map(lambda x: (x[0].strip(), eval(x[1].strip())),
             (t for t in items if self.is_setting(t[0])))
         output = dict(items)
@@ -66,12 +63,12 @@
         self.call_command('time_zone', locate=True)
         location = os.path.join(os.path.realpath(os.path.curdir), 'test.cfg')
         expected_output = "setting TIME_ZONE last defined in '%s'" % location
-        self.assertEqual(self.capture['stdout'].strip(), expected_output)
+        self.assertEqual(self.output.strip(), expected_output)
 
     def test_locate_setting_not_found(self):
         self.call_command('bogus', locate=True)
         expected_output = 'setting BOGUS not found'
-        self.assertEqual(self.capture['stdout'].strip(), expected_output)
+        self.assertEqual(self.output.strip(), expected_output)
 
     def test_locate_setting_no_configglue_parser(self):
         wrapped = getattr(settings, self.wrapped_settings)
@@ -84,7 +81,7 @@
                              locals(), [''])
             location = os.path.realpath(mod.__file__)
             expected_output = "setting TIME_ZONE last defined in %r" % location
-            self.assertEqual(self.capture['stdout'].strip(), expected_output)
+            self.assertEqual(self.output.strip(), expected_output)
         finally:
             wrapped.__CONFIGGLUE_PARSER__ = old_CONFIGGLUE_PARSER
 
@@ -96,7 +93,7 @@
         try:
             self.call_command('bogus', locate=True)
             expected_output = 'setting BOGUS not found'
-            self.assertEqual(self.capture['stdout'].strip(), expected_output)
+            self.assertEqual(self.output.strip(), expected_output)
         finally:
             wrapped.__CONFIGGLUE_PARSER__ = old_CONFIGGLUE_PARSER
 
@@ -115,10 +112,11 @@
 class GeneratedSettingsTestCase(ConfigGlueDjangoCommandTestCase,
         SchemaHelperTestCase):
     def setUp(self):
+        super(GeneratedSettingsTestCase, self).setUp()
         self.expected_schema = schemas.get(
             django.get_version(), strict=True)()
-
-        mock_get_version = Mock(return_value='foo')
+        self.version = '.'.join(django.get_version().split('.')[:2]) + '.foo'
+        mock_get_version = Mock(return_value=self.version)
         self.patch_get_version = patch(
             'django_configglue.tests.settings.django.get_version',
             mock_get_version)
@@ -127,7 +125,6 @@
         self.patch_warn = patch(
             'django_configglue.schema.logging.warn', self.mock_warn)
         self.patch_warn.start()
-        super(GeneratedSettingsTestCase, self).setUp()
 
     def tearDown(self):
         self.patch_get_version.stop()
@@ -137,22 +134,29 @@
     def test_generated_schema(self):
         # import here so that the necessary modules can be mocked before
         # being required
+        self.load_settings()
+
         from django.conf import settings
         schema = settings.__CONFIGGLUE_PARSER__.schema
 
         self.assert_schemas_equal(schema, self.expected_schema)
         self.assertEqual(self.mock_warn.call_args_list,
-            [(("No schema registered for version 'foo'",), {}),
-             (("Dynamically creating schema for version 'foo'",), {})])
+            [(("No schema registered for version '%s'" % self.version,),
+              {}),
+             (("Dynamically creating schema for version '%s'" % self.version,),
+              {})])
 
 
 class ValidateCommandTestCase(ConfigGlueDjangoCommandTestCase):
     COMMAND = 'settings'
 
     def test_valid_config(self):
-        self.call_command(validate=True)
+        try:
+            self.call_command(validate=True)
+        except SystemExit:
+            pass
         expected_output = 'Settings appear to be fine.'
-        self.assertEqual(self.capture['stdout'].strip(), expected_output)
+        self.assertEqual(self.output.strip(), expected_output)
 
     def test_invalid_config(self):
         config = """
@@ -168,7 +172,7 @@
         except SystemExit, e:
             self.assertEqual(e.code, 1)
             error_msg = 'Error: Settings did not validate against schema.'
-            self.assertTrue(self.capture['stderr'].strip().startswith(
+            self.assertTrue(self.output.strip().startswith(
                 error_msg))
 
     def test_no_configglue_parser(self):
@@ -180,7 +184,7 @@
             self.call_command(validate=True)
             expected_output = ('The settings module was not generated by '
                 'configglue. Can only validate configglue generated settings.')
-            self.assertEqual(self.capture['stdout'].strip(), expected_output)
+            self.assertEqual(self.output.strip(), expected_output)
         finally:
             wrapped.__CONFIGGLUE_PARSER__ = old_CONFIGGLUE_PARSER
 
@@ -190,7 +194,7 @@
 
     def test_help(self):
         self.call_command()
-        self.assertTrue('--django_debug' in self.capture['stdout'])
+        self.assertTrue('--django_debug' in self.output)
 
     def test_update_settings(self):
         self.assertTrue(settings.DEBUG)
@@ -201,7 +205,7 @@
             utility.execute()
         finally:
             self.end_capture()
-        self.assertTrue('False' in self.capture['stdout'])
+        self.assertTrue('False' in self.output)
 
     def test_version_is_printed_once(self):
         args = ['manage.py', '--version']
@@ -212,14 +216,18 @@
         finally:
             self.end_capture()
         expected = get_version()
-        self.assertEqual(1, self.capture['stdout'].count(expected))
+        self.assertEqual(1, self.output.count(expected))
 
     def test_noargs_doesnt_error(self):
         args = ['manage.py']
         utility = ManagementUtility(argv=args)
         self.begin_capture()
         try:
-            self.assertRaises(SystemExit, utility.execute)
+            utility.execute()
+        except SystemExit:
+            # Django <= 1.3 uses SystemExit to terminate management
+            # command
+            pass
         finally:
             self.end_capture()
-        self.assertFalse('Unknown command' in self.capture['stdout'])
+        self.assertFalse('Unknown command' in self.output)

=== modified file 'django_configglue/utils.py'
--- django_configglue/utils.py	2011-07-27 00:14:34 +0000
+++ django_configglue/utils.py	2013-03-22 14:01:30 +0000
@@ -1,5 +1,7 @@
 # Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
 # GNU Lesser General Public License version 3 (see the file LICENSE).
+import imp
+import os
 import sys
 
 from configglue.parser import SchemaConfigParser
@@ -56,3 +58,16 @@
     scp.read(configs)
     update_settings(scp, target)
     return scp
+
+
+def get_project_settings():
+    """Find project_template settings file, in 1.4 you can't just use import"""
+    from django import conf
+
+    project_template_dir = os.path.join(
+        os.path.dirname(conf.__file__),
+        'project_template')
+    for root, dirs, files in os.walk(project_template_dir):
+        if 'settings.py' in files:
+            return imp.load_source('project_settings',
+                                   os.path.join(root, 'settings.py'))

=== modified file 'setup.py'
--- setup.py	2011-07-27 00:14:34 +0000
+++ setup.py	2013-03-22 14:01:30 +0000
@@ -38,7 +38,7 @@
 
     # content
     packages=find_packages(exclude=['testproject*']),
-    install_requires=['django >= 1.0.2-final', 'configglue >= 1.0'],
+    install_requires=['django >= 1.3.7', 'configglue >= 1.0'],
 
     # tests
     test_suite='testproject.testrunner.runtests',

=== removed file 'testproject/main-12.cfg'
--- testproject/main-12.cfg	2011-04-11 01:06:16 +0000
+++ testproject/main-12.cfg	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[django]
-database_engine = sqlite3
-database_name = :memory:
-installed_apps = django_configglue
-databases = databases
-
-[databases]
-default = db_default
-
-[db_default]
-engine = sqlite3
-name = :memory:

=== added file 'testproject/main-14.cfg'
--- testproject/main-14.cfg	1970-01-01 00:00:00 +0000
+++ testproject/main-14.cfg	2013-03-22 14:01:30 +0000
@@ -0,0 +1,10 @@
+[django]
+installed_apps = django_configglue
+databases = databases
+
+[databases]
+default = db_default
+
+[db_default]
+engine = django.db.backends.sqlite3
+name = :memory:

=== modified file 'testproject/main.cfg'
--- testproject/main.cfg	2011-04-11 01:06:16 +0000
+++ testproject/main.cfg	2013-03-22 14:01:30 +0000
@@ -1,4 +1,2 @@
 [django]
-database_engine = sqlite3
-database_name = :memory:
 installed_apps = django_configglue

=== modified file 'tox.ini'
--- tox.ini	2013-02-20 08:48:09 +0000
+++ tox.ini	2013-03-22 14:01:30 +0000
@@ -1,73 +1,49 @@
 [tox]
 envlist =
-    py26-django114,
-    py26-django127,
-    py26-django135,
-    py26-django143,
-    py27-django114,
-    py27-django127,
-    py27-django135,
-    py27-django143,
+    py26-django137,
+    py26-django141,
+    py26-django145,
+    py27-django137,
+    py27-django145,
     configglue-dev
 
 [testenv]
 commands = python setup.py test
 
-[testenv:py26-django114]
-basepython = python2.6
-deps =
-    configglue
-    mock
-    django==1.1.4
-
-[testenv:py26-django127]
-basepython = python2.6
-deps =
-    configglue
-    mock
-    django==1.2.7
-
-[testenv:py26-django135]
-basepython = python2.6
-deps =
-    configglue
-    mock
-    django==1.3.5
-
-[testenv:py26-django143]
-basepython = python2.6
-deps =
-    configglue
-    mock
-    django==1.4.3
-
-[testenv:py27-django114]
-basepython = python2.7
-deps =
-    configglue
-    mock
-    django==1.1.4
-
-[testenv:py27-django127]
-basepython = python2.7
-deps =
-    configglue
-    mock
-    django==1.2.7
-
-[testenv:py27-django135]
-basepython = python2.7
-deps =
-    configglue
-    mock
-    django==1.3.5
-
-[testenv:py27-django143]
-basepython = python2.7
-deps =
-    configglue
-    mock
-    django==1.4.3
+[testenv:py26-django137]
+basepython = python2.6
+deps =
+    configglue
+    mock
+    django==1.3.7
+
+[testenv:py26-django145]
+basepython = python2.6
+deps =
+    configglue
+    mock
+    django==1.4.5
+
+[testenv:py26-django141]
+basepython = python2.6
+deps =
+    configglue
+    mock
+    django==1.4.1
+
+[testenv:py27-django137]
+basepython = python2.7
+deps =
+    configglue
+    mock
+    django==1.3.7
+
+[testenv:py27-django145]
+basepython = python2.7
+deps =
+    configglue
+    mock
+    django==1.4.5
 
 [testenv:configglue-dev]
 deps =