← Back to team overview

configglue team mailing list archive

[Merge] lp:~ricardokirkner/django-configglue/825191-caches-wrong-item into lp:django-configglue

 

Ricardo Kirkner has proposed merging lp:~ricardokirkner/django-configglue/825191-caches-wrong-item into lp:django-configglue.

Requested reviews:
  Szilveszter Farkas (phanatic)
  Configglue developers (configglue)

For more details, see:
https://code.launchpad.net/~ricardokirkner/django-configglue/825191-caches-wrong-item/+merge/71464

fix bug in django 1.3 schema for caches setting
-- 
https://code.launchpad.net/~ricardokirkner/django-configglue/825191-caches-wrong-item/+merge/71464
Your team Configglue developers is requested to review the proposed merge of lp:~ricardokirkner/django-configglue/825191-caches-wrong-item into lp:django-configglue.
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-15 22:44:18 +0000
+++ debian/changelog	2011-08-13 21:28:22 +0000
@@ -1,3 +1,10 @@
+django-configglue (0.6-0ubuntu1) natty; urgency=low
+
+  * updated documentation
+  * Updated django-configglue to make it compatible with configglue 1.0
+
+ -- Ricardo Kirkner <ricardo.kirkner@xxxxxxxxxxxxx>  Fri, 05 Aug 2011 17:51:41 -0300
+
 django-configglue (0.5-0ubuntu1) natty; urgency=low
 
   * Bug (LP: #770093) automatic schema introspection if schema version not found

=== modified file 'django_configglue/schema.py'
--- django_configglue/schema.py	2011-08-05 18:50:53 +0000
+++ django_configglue/schema.py	2011-08-13 21:28:22 +0000
@@ -1002,7 +1002,11 @@
         # CACHE #
         #########
 
-        caches = DictOption()
+        caches = DictOption(
+            item=UpperCaseDictOption(spec={
+                'backend': StringOption(),
+                'location': StringOption()})
+            )
         cache_middleware_alias = StringOption(default='default')
 
         ############

=== modified file 'django_configglue/tests/test_configglue.py'
--- django_configglue/tests/test_configglue.py	2011-08-05 18:50:53 +0000
+++ django_configglue/tests/test_configglue.py	2011-08-13 21:28:22 +0000
@@ -274,6 +274,15 @@
         derivated = derivate_django_schema(Parent)
         self.assertEqual(derivated, Parent)
 
+    def test_django13_caches(self):
+        schema = schemas.get('1.3')
+        expected = DictOption(
+            item=UpperCaseDictOption(
+                spec={
+                    'backend': StringOption(),
+                    'location': StringOption()}))
+        self.assertEqual(schema.django.caches.item, expected.item)
+
 
 class GlueManagementUtilityTestCase(ConfigGlueDjangoCommandTestCase):
     def setUp(self):


Follow ups