Merge lp:~michael.nelson/django-configglue/default_wsgi_application_none into lp:django-configglue

[Michael Nelson]

Default value for Django 1.4's wsgi_application is None.

Ensure the default value for Django 1.4's wsgi_application is None, rather than ''.

See the bug for more details.

`python setup.py test`

[Ricardo Kirkner (ricardokirkner)]

look good, except that a nullable string option should have null=True in the constructor to allow for the None value. If null=True is used, the default value will be None, so no need to pass that in explicitely.

review: Needs Fixing

[lp:~michael.nelson/django-configglue/default_wsgi_application_none]

76. By Michael Nelson on 2013-04-29

REFACTOR: switch from default=None to null=True which implies the former.

[Michael Nelson (michael.nelson)]

Thanks. Fixed in r76.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'django_configglue/schema.py'
--- django_configglue/schema.py	2013-04-03 12:35:25 +0000
+++ django_configglue/schema.py	2013-04-29 06:39:24 +0000
@@ -1163,7 +1163,8 @@
 
         wsgi_application = StringOption(
             help="The full Python path of the WSGI application object"
-                 "that Django's built-in servers (e.g. runserver) will use.")
+                 "that Django's built-in servers (e.g. runserver) will use.",
+            null=True)
 
         csrf_cookie_secure = BoolOption(
             default=False,

=== modified file 'django_configglue/tests/test_schema.py'
--- django_configglue/tests/test_schema.py	2012-01-10 12:16:57 +0000
+++ django_configglue/tests/test_schema.py	2013-04-29 06:39:24 +0000
@@ -4,7 +4,10 @@
 
 from configglue.parser import SchemaConfigParser
 
-from django_configglue.schema import BaseDjangoSchema
+from django_configglue.schema import (
+    BaseDjangoSchema,
+    Django14Schema,
+)
 
 
 class DjangoSchemaTestCase(TestCase):
@@ -19,3 +22,8 @@
         value = parser.values()['django']['time_zone']
         self.assertEqual(value, None)
 
+    def test_default_wsgi_application_is_none(self):
+        parser = SchemaConfigParser(Django14Schema())
+
+        value = parser.values()['django']['wsgi_application']
+        self.assertIsNone(value)