Merge lp:~ricardokirkner/django-configglue/tox into lp:django-configglue

[Ricardo Kirkner]

use tox to test all major django versions

This branch adds support for testing django_configglue against all major django versions using tox.

Existing tests have now been made to run against versions

- 1.0.2 final
- 1.0.4
- 1.1.2
- 1.1.4
- 1.2.5
- 1.3

using python 2.6.

Adding more tests and testing against other versions of Python is left for future work.

How to test
===========

Simply run

./tox

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

You can move common dependencies for each environment to [testenv] section. Like

[testenv]
deps = configglue
       mock

[Michael Foord (mfoord)]

We need a better solution than deepcopying, but it is a hard problem. Other than that great.

review: Approve

[lp:~ricardokirkner/django-configglue/tox]

58. By Ricardo Kirkner on 2011-04-13

fixed small style issue per review

59. By Ricardo Kirkner on 2011-04-13

fixed style issues per review

=== modified file 'django_configglue/__init__.py'
--- django_configglue/__init__.py	2011-01-10 21:43:27 +0000
+++ django_configglue/__init__.py	2011-04-13 17:14:29 +0000
@@ -42,7 +42,8 @@
             options, args = parser.parse_args(self.argv)
             handle_default_options(options)
         except:
-            pass # Ignore any option errors at this point.
+            # Ignore any option errors at this point.
+            args = self.argv
 
         try:
             subcommand = self.argv[1]

=== modified file 'django_configglue/management/commands/settings.py'
--- django_configglue/management/commands/settings.py	2011-01-10 21:43:27 +0000
+++ django_configglue/management/commands/settings.py	2011-04-13 17:14:29 +0000
@@ -106,7 +106,7 @@
         else:
             # looking in django settings
             for key in map(str.upper, keys):
-                if key in settings.get_all_members():
+                if key in dir(settings):
                     msg = "setting %s last defined in %r"
                     output.append(msg % (key, os.path.realpath(location)))
                 else:

=== modified file 'django_configglue/schema.py'
--- django_configglue/schema.py	2011-02-19 23:14:11 +0000
+++ django_configglue/schema.py	2011-04-13 17:14:29 +0000
@@ -1,6 +1,7 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Lesser General Public License version 3 (see the file LICENSE).
 import logging
+from copy import deepcopy
 
 from configglue.pyschema.schema import (
     BoolConfigOption,
@@ -21,8 +22,20 @@
 gettext_noop = lambda s: s
 
 
+class UpperCaseDictConfigOption(DictConfigOption):
+    """ A DictConfigOption with all upper-case keys. """
+    def parse(self, section, parser=None, raw=False):
+        parsed = super(UpperCaseDictConfigOption, self).parse(
+            section, parser, raw)
+        result = {}
+        for k, v in parsed.items():
+            result[k.upper()] = v
+        return result
+
 
 class BaseDjangoSchema(Schema):
+    version = '1.0.2 final'
+
     # Sections
     django = ConfigSection('django')
 
@@ -256,6 +269,9 @@
              "secret-key hashing algorithms. Set this in your settings, or "
              "Django will complain loudly")
 
+    django.jing_path = StringConfigOption(default='/usr/bin/jing',
+        help="Path to the 'jing' executable -- needed to validate XMLFields")
+
     django.default_file_storage = StringConfigOption(
         default='django.core.files.storage.FileSystemStorage',
         help="Default file storage mechanism that holds media")
@@ -452,23 +468,500 @@
     django.root_urlconf = StringConfigOption(default='urls')
 
 
-class Django102Schema(BaseDjangoSchema):
-    version = '1.0.2'
-
-    def __init__(self, *args, **kwargs):
-        super(Django102Schema, self).__init__(*args, **kwargs)
-
-        ################
-        # CORE         #
-        ################
-
-        self.django.jing_path = StringConfigOption(default='/usr/bin/jing',
-            help="Path to the 'jing' executable -- needed to validate XMLFields")
-
-
 class Django112Schema(BaseDjangoSchema):
     version = '1.1.2'
 
+    # sections
+    django = deepcopy(BaseDjangoSchema.django)
+
+    ################
+    # CORE         #
+    ################
+
+    # update default value
+    django.languages.default = (
+        ('ar', gettext_noop('Arabic')),
+        ('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')),
+        ('es', gettext_noop('Spanish')),
+        ('es-ar', gettext_noop('Argentinean 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')),
+        ('is', gettext_noop('Icelandic')),
+        ('it', gettext_noop('Italian')),
+        ('ja', gettext_noop('Japanese')),
+        ('ka', gettext_noop('Georgian')),
+        ('km', gettext_noop('Khmer')),
+        ('kn', gettext_noop('Kannada')),
+        ('ko', gettext_noop('Korean')),
+        ('lt', gettext_noop('Lithuanian')),
+        ('lv', gettext_noop('Latvian')),
+        ('mk', gettext_noop('Macedonian')),
+        ('nl', gettext_noop('Dutch')),
+        ('no', gettext_noop('Norwegian')),
+        ('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')),
+        ('ta', gettext_noop('Tamil')),
+        ('te', gettext_noop('Telugu')),
+        ('th', gettext_noop('Thai')),
+        ('tr', gettext_noop('Turkish')),
+        ('uk', gettext_noop('Ukrainian')),
+        ('zh-cn', gettext_noop('Simplified Chinese')),
+        ('zh-tw', gettext_noop('Traditional Chinese')),
+    )
+
+
+class Django125Schema(Django112Schema):
+    version = '1.2.5'
+
+    # sections
+    django = deepcopy(Django112Schema.django)
+
+    ################
+    # CORE         #
+    ################
+
+    # update default value
+    django.languages.default = [
+        ('ar', gettext_noop('Arabic')),
+        ('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')),
+        ('es', gettext_noop('Spanish')),
+        ('es-ar', gettext_noop('Argentinian 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')),
+        ('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')),
+        ('nl', gettext_noop('Dutch')),
+        ('no', gettext_noop('Norwegian')),
+        ('nb', gettext_noop('Norwegian Bokmal')),
+        ('nn', gettext_noop('Norwegian Nynorsk')),
+        ('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')),
+        ('ta', gettext_noop('Tamil')),
+        ('te', gettext_noop('Telugu')),
+        ('th', gettext_noop('Thai')),
+        ('tr', gettext_noop('Turkish')),
+        ('uk', gettext_noop('Ukrainian')),
+        ('vi', gettext_noop('Vietnamese')),
+        ('zh-cn', gettext_noop('Simplified Chinese')),
+        ('zh-tw', gettext_noop('Traditional Chinese')),
+    ]
+
+    django.use_l10n = BoolConfigOption(
+        default=True,
+        help="If you set this to False, Django will not format dates, "
+            "numbers and calendars according to the current locale")
+
+    django.databases = DictConfigOption(
+        item=UpperCaseDictConfigOption(spec={
+            'engine': StringConfigOption(default='django.db.backends.'),
+            'name': StringConfigOption(),
+            'user': StringConfigOption(),
+            'password': StringConfigOption(),
+            'host': StringConfigOption(),
+            'port': StringConfigOption(),
+        }),
+        default={
+            'default': {
+                'engine': 'django.db.backends.',
+                'name': '',
+                'user': '',
+                'password': '',
+                'host': '',
+                'port': '',
+            }
+        })
+    django.database_routers = LinesConfigOption(
+        item=StringConfigOption(),
+        help="Classes used to implement db routing behaviour")
+
+    django.email_backend = StringConfigOption(
+        default='django.core.mail.backends.smtp.EmailBackend',
+        help="The email backend to use. For possible shortcuts see "
+            "django.core.mail. The default is to use the SMTP backend. "
+            "Third party backends can be specified by providing a Python "
+            "path to a module that defines an EmailBackend class.")
+
+    django.installed_apps.default = [
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.sessions',
+        'django.contrib.sites',
+        'django.contrib.messages',
+    ]
+
+    django.template_loaders.default = [
+        'django.template.loaders.filesystem.Loader',
+        'django.template.loaders.app_directories.Loader',
+    ]
+
+    django.template_context_processors.default = [
+        'django.contrib.auth.context_processors.auth',
+        'django.core.context_processors.debug',
+        'django.core.context_processors.i18n',
+        'django.core.context_processors.media',
+        'django.contrib.messages.context_processors.messages',
+    ]
+
+    django.format_module_path = StringConfigOption(
+        null=True, default=None,
+        help="Python module path where user will place custom format "
+            "definition. The directory where this setting is pointing "
+            "should contain subdirectories named as the locales, "
+            "containing a formats.py file")
+    django.short_date_format = StringConfigOption(
+        default='m/d/Y',
+        help="Default short formatting for date objects")
+    django.short_datetime_format = StringConfigOption(
+        default='m/d/Y P',
+        help="Default short formatting for datetime objects")
+    django.date_input_formats = LinesConfigOption(
+        item=StringConfigOption(),
+        default=[
+            '%%Y-%%m-%%d', '%%m/%%d/%%Y', '%%m/%%d/%%y', # '2006-10-25', '10/25/2006', '10/25/06'
+            '%%b %%d %%Y', '%%b %%d, %%Y',               # 'Oct 25 2006', 'Oct 25, 2006'
+            '%%d %%b %%Y', '%%d %%b, %%Y',               # '25 Oct 2006', '25 Oct, 2006'
+            '%%B %%d %%Y', '%%B %%d, %%Y',               # 'October 25 2006', 'October 25, 2006'
+            '%%d %%B %%Y', '%%d %%B, %%Y',               # '25 October 2006', '25 October, 2006'
+        ],
+        help="Default formats to be used when parsing dates from input "
+            "boxes, in order")
+    django.time_input_formats = LinesConfigOption(
+        item=StringConfigOption(),
+        default=[
+            '%%H:%%M:%%S',     # '14:30:59'
+            '%%H:%%M',         # '14:30'
+        ],
+        help="Default formats to be used when parsing times from input "
+            "boxes, in order")
+    django.datetime_input_formats = LinesConfigOption(
+        item=StringConfigOption(),
+        default=[
+            '%%Y-%%m-%%d %%H:%%M:%%S',     # '2006-10-25 14:30:59'
+            '%%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',         # '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',         # '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")
+
+    django.first_day_of_week = IntConfigOption(
+        default=0,
+        help="First day of week, to be used on calendars. 0 means Sunday, "
+            "1 means Monday...")
+    django.decimal_separator = StringConfigOption(
+        default='.',
+        help="Decimal separator symbol")
+    django.use_thousand_separator = BoolConfigOption(
+        default=False,
+        help="Boolean that sets whether to add thousand separator when "
+            "formatting numbers")
+    django.number_grouping = IntConfigOption(
+        default=0,
+        help="Number of digits that will be together, when splitting them "
+            "by THOUSAND_SEPARATOR. 0 means no grouping, 3 means "
+            "splitting by thousands...")
+    django.thousand_separator = StringConfigOption(
+        default=',',
+        help="Thousand separator symbol")
+
+    ##############
+    # MIDDLEWARE #
+    ##############
+
+    django.middleware_classes.default = [
+        'django.middleware.common.CommonMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    ]
+
+    ########
+    # CSRF #
+    ########
+
+    django.csrf_failure_view = StringConfigOption(
+        default='django.views.csrf.csrf_failure',
+        help="Dotted path to callable to be used as view when a request "
+            "is rejected by the CSRF middleware")
+    django.csrf_cookie_name = StringConfigOption(
+        default='csrftoken',
+        help="Name for CSRF cookie")
+    django.csrf_cookie_domain = StringConfigOption(
+        null=True,
+        help="Domain for CSRF cookie")
+
+    ############
+    # MESSAGES #
+    ############
+
+    django.message_storage = StringConfigOption(
+        default='django.contrib.messages.storage.user_messages.'
+            'LegacyFallbackStorage',
+        help="Class to be used as messages backend")
+
+    ###########
+    # TESTING #
+    ###########
+
+    django.test_runner.default = (
+        'django.test.simple.DjangoTestSuiteRunner')
+    django.test_runner.help = (
+        "The name of the class to use to run the test suite")
+
+
+class Django13Schema(Django125Schema):
+    version = '1.3'
+
+    # sections
+    django = deepcopy(Django125Schema.django)
+
+    ################
+    # CORE         #
+    ################
+
+    # update default value
+    django.languages.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')),
+        ('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')),
+        ('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')),
+        ('nl', gettext_noop('Dutch')),
+        ('no', gettext_noop('Norwegian')),
+        ('nb', gettext_noop('Norwegian Bokmal')),
+        ('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')),
+        ('ta', gettext_noop('Tamil')),
+        ('te', gettext_noop('Telugu')),
+        ('th', gettext_noop('Thai')),
+        ('tr', gettext_noop('Turkish')),
+        ('uk', gettext_noop('Ukrainian')),
+        ('ur', gettext_noop('Urdu')),
+        ('vi', gettext_noop('Vietnamese')),
+        ('zh-cn', gettext_noop('Simplified Chinese')),
+        ('zh-tw', gettext_noop('Traditional Chinese')),
+    ]
+
+    django.template_context_processors.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.contrib.messages.context_processors.messages',
+    ]
+
+    django.static_root = StringConfigOption(
+        default='',
+        help='Absolute path to the directory that holds static files.')
+
+    django.static_url = StringConfigOption(
+        null=True, default=None,
+        help='URL that handles the static files served from STATIC_ROOT.')
+
+    ############
+    # SESSIONS #
+    ############
+
+    django.session_cookie_httponly = BoolConfigOption(
+        default=False,
+        help='Whether to use the non-RFC standard htt pOnly flag (IE, FF3+, others)')
+
+    #########
+    # CACHE #
+    #########
+
+    # remove obsoleted setting
+    del django.cache_backend
+
+    django.caches = DictConfigOption()
+    django.cache_middleware_alias = StringConfigOption(default='default')
+
+    ############
+    # COMMENTS #
+    ############
+
+    django.profanities_list.default = ()
+
+    ###########
+    # LOGGING #
+    ###########
+
+    django.logging_config = StringConfigOption(
+        default='django.utils.log.dictConfig',
+        help='The callable to use to configure logging')
+    django.logging = DictConfigOption(
+        spec={
+            'version': IntConfigOption(default=1),
+            'disable_existing_loggers': BoolConfigOption(default=False),
+            'handlers': DictConfigOption(
+                spec={
+                    'mail_admins': DictConfigOption(
+                        spec={
+                            'level': StringConfigOption(default='ERROR'),
+                            'class': StringConfigOption(
+                                default='django.utils.log.AdminEmailHandler'),
+                        }),
+                }),
+            'loggers': DictConfigOption(
+                spec={
+                    'django.request': DictConfigOption(
+                        spec={
+                            'handlers': LinesConfigOption(
+                                item=StringConfigOption(),
+                                default=['mail_admins']),
+                            'level': StringConfigOption(default='ERROR'),
+                            'propagate': BoolConfigOption(default=False),
+                        }),
+                }),
+        },
+        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.')
+
+    ###############
+    # STATICFILES #
+    ###############
+
+    django.staticfiles_dirs = LinesConfigOption(
+        item=StringConfigOption(),
+        help='A list of locations of additional static files')
+    django.staticfiles_storage = StringConfigOption(
+        default='django.contrib.staticfiles.storage.StaticFilesStorage',
+        help='The default file storage backend used during the build process')
+    django.staticfiles_finders = LinesConfigOption(
+        item=StringConfigOption(),
+        default=[
+            'django.contrib.staticfiles.finders.FileSystemFinder',
+            'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+        ],
+        help='List of finder classes that know how to find static files in '
+            'various locations.')
+
+    django.admin_media_prefix.default = '/static/admin/'
+
 
 class DjangoSchemaFactory(object):
     def __init__(self):
@@ -506,8 +999,9 @@
 
 
 schemas = DjangoSchemaFactory()
-schemas.register(Django102Schema)
+schemas.register(BaseDjangoSchema, '1.0.2 final')
+schemas.register(BaseDjangoSchema, '1.0.4')
 schemas.register(Django112Schema)
-# also register the same schema for lucid's django version (which is exported
-# as 1.1.1 but is essentially 1.1.2
-schemas.register(Django112Schema, '1.1.1')
+schemas.register(Django112Schema, '1.1.4')
+schemas.register(Django125Schema)
+schemas.register(Django13Schema)

=== modified file 'django_configglue/tests/helpers.py'
--- django_configglue/tests/helpers.py	2011-01-17 15:32:29 +0000
+++ django_configglue/tests/helpers.py	2011-04-13 17:14:29 +0000
@@ -3,6 +3,7 @@
 
 import os
 import sys
+import textwrap
 from StringIO import StringIO
 
 import django
@@ -15,13 +16,27 @@
     COMMAND = ''
 
     def setUp(self):
-        config = """
-[django]
-database_engine = sqlite3
-database_name = :memory:
-installed_apps = django_configglue
-time_zone = Europe/London
-"""
+        config = textwrap.dedent("""
+            [django]
+            database_engine = sqlite3
+            database_name = :memory:
+            installed_apps = django_configglue
+            time_zone = Europe/London
+        """)
+
+        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()
 
@@ -39,10 +54,13 @@
 
     @property
     def wrapped_settings(self):
-        if django.VERSION[:2] < (1, 1):
-            wrapped = '_target'
-        else:
+        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
 
     def load_settings(self, module='django_configglue.tests.settings'):
@@ -51,9 +69,8 @@
         if old_module in sys.modules:
             del sys.modules[old_module]
         # keep runtime settings
-        if django.VERSION[:2] < (1, 1):
-            extra_settings = {}
-        else:
+        extra_settings = {}
+        if django.VERSION[:2] == (1, 1):
             extra_settings = {
                 'DATABASE_NAME': settings.DATABASE_NAME,
                 'DATABASE_SUPPORTS_TRANSACTIONS': getattr(

=== modified file 'django_configglue/tests/settings.py'
--- django_configglue/tests/settings.py	2011-01-17 15:32:29 +0000
+++ django_configglue/tests/settings.py	2011-04-13 17:14:29 +0000
@@ -6,6 +6,9 @@
 from django_configglue.schema import schemas
 
 
-DjangoSchema = schemas.get(django.get_version())
-configglue(DjangoSchema, ['main.cfg', 'test.cfg'], __name__)
+DjangoSchema = schemas.get(django.get_version(), strict=False)
+main_cfg = 'main.cfg'
+if DjangoSchema.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	2011-02-19 23:14:11 +0000
+++ django_configglue/tests/test_configglue.py	2011-04-13 17:14:29 +0000
@@ -2,9 +2,11 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Lesser General Public License version 3 (see the file LICENSE).
 
+import textwrap
 from cStringIO import StringIO
 from unittest import TestCase
 
+import django
 from configglue.pyschema.schema import (
     DictConfigOption,
     IntConfigOption,
@@ -26,10 +28,10 @@
     update_settings,
 )
 from django_configglue.schema import (
-    schemas,
     BaseDjangoSchema,
-    Django102Schema,
     DjangoSchemaFactory,
+    UpperCaseDictConfigOption,
+    schemas,
 )
 from django_configglue.tests.helpers import ConfigGlueDjangoCommandTestCase
 
@@ -38,8 +40,9 @@
     def test_get_django_settings(self):
         class MySchema(Schema):
             foo = IntConfigOption()
-            bar = DictConfigOption({'baz': IntConfigOption(),
-                                    'BAZ': IntConfigOption()})
+            bar = DictConfigOption(
+                spec={'baz': IntConfigOption(),
+                      'BAZ': IntConfigOption()})
 
         expected = {'FOO': 0, 'BAR': {'baz': 0, 'BAZ': 0}}
 
@@ -76,7 +79,7 @@
 
     def test_schemafactory_get(self):
         # test get valid version
-        self.assertEqual(schemas.get('1.0.2'), Django102Schema)
+        self.assertEqual(schemas.get('1.0.2 final'), BaseDjangoSchema)
 
         # test get invalid version
         self.assertRaises(ValueError, schemas.get, '1.1')
@@ -85,64 +88,63 @@
     def test_schemafactory_get_nonexisting_too_old(self, mock_logging):
         schema = schemas.get('0.96', strict=False)
 
-        django_102 = schemas.get('1.0.2')
+        django_102 = schemas.get('1.0.2 final')
         self.assertEqual(schema, django_102)
         self.assertRaises(ValueError, schemas.get, '0.96')
 
         self.assertEqual(mock_logging.warn.call_args_list[0][0][0],
             "No schema registered for version '0.96'")
         self.assertEqual(mock_logging.warn.call_args_list[1][0][0],
-            "Falling back to schema for version '1.0.2'")
+            "Falling back to schema for version '1.0.2 final'")
 
     @patch('django_configglue.schema.logging')
     def test_schemafactory_get_nonexisting(self, mock_logging):
         schema = schemas.get('1.0.3', strict=False)
 
-        django_102 = schemas.get('1.0.2')
+        django_102 = schemas.get('1.0.2 final')
         self.assertEqual(schema, django_102)
         self.assertRaises(ValueError, schemas.get, '1.0.3')
 
         self.assertEqual(mock_logging.warn.call_args_list[0][0][0],
             "No schema registered for version '1.0.3'")
         self.assertEqual(mock_logging.warn.call_args_list[1][0][0],
-            "Falling back to schema for version '1.0.2'")
+            "Falling back to schema for version '1.0.2 final'")
 
     @patch('django_configglue.schema.logging')
     def test_schemafactory_get_nonexisting_too_new(self, mock_logging):
         schema = schemas.get('1.2.0', strict=False)
 
-        django_112 = schemas.get('1.1.2')
+        django_112 = schemas.get('1.1.4')
         self.assertEqual(schema, django_112)
         self.assertRaises(ValueError, schemas.get, '1.2.0')
 
         self.assertEqual(mock_logging.warn.call_args_list[0][0][0],
             "No schema registered for version '1.2.0'")
         self.assertEqual(mock_logging.warn.call_args_list[1][0][0],
-            "Falling back to schema for version '1.1.2'")
+            "Falling back to schema for version '1.1.4'")
 
     @patch('django_configglue.schema.logging')
     def test_schemafactory_get_no_versions_registered(self, mock_logging):
         schemas = DjangoSchemaFactory()
         try:
-            schemas.get('1.0.2', strict=False)
+            schemas.get('1.0.2 final', strict=False)
         except ValueError, e:
             self.assertEqual(str(e), "No schemas registered")
         else:
             self.fail("ValueError not raised")
 
         mock_logging.warn.assert_called_with(
-            "No schema registered for version '1.0.2'")
+            "No schema registered for version '1.0.2 final'")
 
     def test_schema_versions(self):
-        django_102 = schemas.get('1.0.2')()
+        django_102 = schemas.get('1.0.2 final')()
         django_112 = schemas.get('1.1.2')()
-        self.assertEqual(django_102.version, '1.0.2')
-        self.assertTrue(hasattr(django_102.django, 'jing_path'))
+        self.assertEqual(django_102.version, '1.0.2 final')
         self.assertEqual(django_112.version, '1.1.2')
-        self.assertFalse(hasattr(django_112.django, 'jing_path'))
+        self.assertFalse(django_102 is django_112)
 
     def test_register_without_version(self):
-        class MySchema(BaseDjangoSchema):
+        class MySchema(Schema):
             pass
 
         schemas = DjangoSchemaFactory()
@@ -150,12 +152,13 @@
 
     def test_configglue(self):
         target = {}
-        configglue(BaseDjangoSchema, [], target)
+        schema = schemas.get(django.get_version(), strict=False)
+        configglue(schema, [], target)
         # target is consistent with django's settings module
         # except for a few keys
         shared_key = lambda x: (not x.startswith('__') and x.upper() == x and
             x not in ('DATABASE_SUPPORTS_TRANSACTIONS', 'SETTINGS_MODULE'))
-        expected_keys = set(filter(shared_key, settings.get_all_members()))
+        expected_keys = set(filter(shared_key, dir(settings)))
         target_keys = set(filter(shared_key, target.keys()))
 
         self.assertEqual(expected_keys, target_keys)
@@ -245,3 +248,22 @@
         self.execute()
         self.assertTrue('Show settings attributes' in self.capture['stdout'])
 
+
+class UpperCaseDictConfigOptionTestCase(TestCase):
+    def test_parse(self):
+        class MySchema(Schema):
+            foo = UpperCaseDictConfigOption()
+        config = StringIO(textwrap.dedent("""
+            [__main__]
+            foo = mydict
+            [mydict]
+            bar = 42
+        """))
+
+        schema = MySchema()
+        parser = SchemaConfigParser(schema)
+        parser.readfp(config)
+        result = schema.foo.parse('mydict', parser)
+
+        self.assertEqual(result, {'BAR': '42'})
+

=== modified file 'django_configglue/tests/test_settings.py'
--- django_configglue/tests/test_settings.py	2011-01-17 16:01:13 +0000
+++ django_configglue/tests/test_settings.py	2011-04-13 17:14:29 +0000
@@ -36,8 +36,11 @@
             "SETTINGS_MODULE = 'django_configglue.tests.settings'",
             "SETTINGS_ENCODING = '%s'" % SETTINGS_ENCODING,
         ]
-        if django.VERSION[:2] >= (1, 1):
+        django_version = django.VERSION[:2]
+        if django_version == (1, 1):
             expected_values.append("DATABASE_SUPPORTS_TRANSACTIONS = True")
+        if django_version >= (1, 1):
+            expected_values.append("JING_PATH = '/usr/bin/jing'")
         self.call_command(show_current=True)
         output_lines = self.capture['stdout'].strip().split('\n')
         self.assertEqual(set(expected_values), set(output_lines))
@@ -94,16 +97,15 @@
             wrapped.__CONFIGGLUE_PARSER__ = old_CONFIGGLUE_PARSER
 
     def test_wrapped_settings(self):
-        old_VERSION = django.VERSION
-
-        try:
-            django.VERSION = (1, 0, 2)
-            self.assertEqual(self.wrapped_settings, '_target')
-
-            django.VERSION = (1, 1, 2)
-            self.assertEqual(self.wrapped_settings, '_wrapped')
-        finally:
-            django.VERSION = old_VERSION
+        # the settings object has a _target attribute
+        # this is true for versions of django <= 1.0.2
+        expected = '_target'
+        if django.VERSION[:3] > (1, 0, 2):
+            # the settings object has a _wrapped attribute
+            # this is true for versions of django > 1.0.2
+            expected = '_wrapped'
+
+        self.assertEqual(self.wrapped_settings, expected)
 
 
 class ValidateCommandTestCase(ConfigGlueDjangoCommandTestCase):

=== modified file 'django_configglue/utils.py'
--- django_configglue/utils.py	2011-01-17 15:32:29 +0000
+++ django_configglue/utils.py	2011-04-13 17:14:29 +0000
@@ -55,3 +55,4 @@
     scp = SchemaConfigParser(schema_class())
     scp.read(configs)
     update_settings(scp, target)
+    return scp

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

=== modified file 'testproject/main.cfg'
--- testproject/main.cfg	2010-08-06 19:27:35 +0000
+++ testproject/main.cfg	2011-04-13 17:14:29 +0000
@@ -1,4 +1,3 @@
-
 [django]
 database_engine = sqlite3
 database_name = :memory:

=== modified file 'testproject/testrunner.py'
--- testproject/testrunner.py	2010-10-13 16:11:56 +0000
+++ testproject/testrunner.py	2011-04-13 17:14:29 +0000
@@ -11,10 +11,8 @@
 
     os.environ['DJANGO_SETTINGS_MODULE'] = 'testproject.settings'
 
-    from django.conf import settings
-    from django.test.utils import get_runner
+    from django.core.management import call_command
 
-    test_runner = get_runner(settings)
-    failures = test_runner(['django_configglue'], verbosity=1, interactive=True)
-    sys.exit(failures)
+    call_command('test', 'django_configglue')
+    sys.exit(0)
 

=== added file 'tox'
--- tox	1970-01-01 00:00:00 +0000
+++ tox	2011-04-13 17:14:29 +0000
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+import urllib
+url = "https://pytox.googlecode.com/hg/toxbootstrap.py"
+d = dict(__file__='toxbootstrap.py')
+exec urllib.urlopen(url).read() in d
+d['cmdline'](['--recreate'])
\ No newline at end of file

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2011-04-13 17:14:29 +0000
@@ -0,0 +1,47 @@
+[tox]
+envlist =
+    py26-django102,
+    py26-django104,
+    py26-django112,
+    py26-django114,
+    py26-django125,
+    py26-django13
+
+[testenv]
+commands = python setup.py test
+
+[testenv:py26-django102]
+deps = 
+    configglue
+    mock
+    django==1.0.2-final
+
+[testenv:py26-django104]
+deps = 
+    configglue
+    mock
+    django==1.0.4
+
+[testenv:py26-django112]
+deps =
+    configglue
+    mock
+    django==1.1.2
+
+[testenv:py26-django114]
+deps =
+    configglue
+    mock
+    django==1.1.4
+
+[testenv:py26-django125]
+deps =
+    configglue
+    mock
+    django==1.2.5
+
+[testenv:py26-django13]
+deps =
+    configglue
+    mock
+    django==1.3