Merge lp:~phanatic/django-configglue/django-1.6 into lp:django-configglue

[Szilveszter Farkas]

Added support for Django 1.6

Support for Django 1.6 final.

[Ricardo Kirkner (ricardokirkner)]

Thank you Szilveszter! LGTM

review: Approve

=== modified file 'django_configglue/schema.py'
--- django_configglue/schema.py	2013-09-16 02:00:02 +0000
+++ django_configglue/schema.py	2013-11-07 01:15:37 +0000
@@ -1672,6 +1672,55 @@
                  "serializing session data.")
 
 
+Django16Base = derivate_django_schema(
+    Django153Schema)
+
+
+class Django16Schema(Django16Base):
+    version = '1.6'
+
+    class django(Django16Base.django):
+
+        base_dir = StringOption(
+            help="Used by the example project to help build paths for other "
+                 "settings variables.")
+
+        databases = DictOption(
+            item=UpperCaseDictOption(spec={
+                'engine': StringOption(default='django.db.backends.'),
+                'name': StringOption(),
+                'user': StringOption(),
+                'password': StringOption(),
+                'host': StringOption(),
+                'port': StringOption(),
+                'atomic_requests': BoolOption(default=False),
+                'autocommit': BoolOption(default=True),
+                'conn_max_age': IntOption(default=0),
+            }),
+            default={
+                'default': {
+                    'ENGINE': 'django.db.backends.',
+                    'NAME': '',
+                    'USER': '',
+                    'PASSWORD': '',
+                    'HOST': '',
+                    'PORT': '',
+                }
+            })
+
+        csrf_cookie_httponly = BoolOption(
+            default=False,
+            help="Whether to use HttpOnly flag on the CSRF cookie. If this "
+                 "is set to True, client-side JavaScript will not to be able "
+                 "to access the CSRF cookie. See SESSION_COOKIE_HTTPONLY for "
+                 "details on HttpOnly.")
+
+        session_serializer = StringOption(
+            default='django.contrib.sessions.serializers.JSONSerializer',
+            help="Full import path of a serializer class to use for "
+                 "serializing session data.")
+
+
 class DjangoSchemaFactory(object):
     def __init__(self):
         self._schemas = {}
@@ -1810,3 +1859,4 @@
 schemas.register(Django15Schema, '1.5.2')
 schemas.register(Django153Schema)
 schemas.register(Django153Schema, '1.5.4')
+schemas.register(Django16Schema)

=== modified file 'django_configglue/tests/test_settings.py'
--- django_configglue/tests/test_settings.py	2013-05-16 19:02:56 +0000
+++ django_configglue/tests/test_settings.py	2013-11-07 01:15:37 +0000
@@ -43,6 +43,10 @@
             "ROOT_URLCONF = 'urls'",
             "SETTINGS_ENCODING = '%s'" % SETTINGS_ENCODING,
         ]
+        # Django 1.6 needs special treatment (BASE_DIR is not a core setting,
+        # but it's a very useful convention from the example project)
+        if django.VERSION >= (1, 6, 0):
+            expected_values.append("BASE_DIR = ''")
         self.call_command(show_current=True)
         output_lines = self.output.strip().split('\n')
         self.assertEqual(set(expected_values), set(output_lines))

=== modified file 'tox.ini'
--- tox.ini	2013-09-16 02:00:02 +0000
+++ tox.ini	2013-11-07 01:15:37 +0000
@@ -8,6 +8,7 @@
     py26-django15,
     py27-django15,
     py27-django154,
+    py27-django16,
     edge
 
 [testenv]
@@ -69,6 +70,13 @@
     mock
     django==1.5.4
 
+[testenv:py27-django16]
+basepython = python2.7
+deps =
+    configglue
+    mock
+    django==1.6
+
 [testenv:edge]
 deps =
     bzr+http://bazaar.launchpad.net/~configglue/configglue/trunk/