Merge lp:~james-w/django-factory/fix-textfield-generator into lp:django-factory

[James Westby]

Hi,

This fixes max_length=None as found by Anthony.

Thanks,

James

[Anthony Lenton (elachuni)]

Looks fine, thanks James!

review: Approve

=== modified file 'README'
--- README	2012-01-12 15:46:26 +0000
+++ README	2012-02-07 23:04:22 +0000
@@ -352,7 +352,8 @@
 0.8
 ```
 
-
+  * TextFields that have `max_length=None` no longer crash the generator
+    (regression due to the `max_length` change in 0.7)
 
 0.7
 ```
 
=== modified file 'django_factory/generators.py'
--- django_factory/generators.py	2012-01-12 15:03:43 +0000
+++ django_factory/generators.py	2012-02-07 23:04:22 +0000
@@ -36,7 +36,7 @@
     """
     value = factory.getUniqueUnicode(prefix=field.name)
     max_length = getattr(field, "max_length", sys.maxint)
-    if len(value) > max_length:
+    if max_length is not None and len(value) > max_length:
         value = value[-max_length:]
     return value
 
 
=== modified file 'django_project/factory_tests/models.py'
--- django_project/factory_tests/models.py	2012-01-12 15:41:57 +0000
+++ django_project/factory_tests/models.py	2012-02-07 23:04:22 +0000
@@ -94,6 +94,11 @@
     text_field = models.TextField(max_length=100)
 
 
+class ModelWithNoneMaxLengthTextField(models.Model):
+
+    text_field = models.TextField(max_length=None)
+
+
 class ModelWithSlugField(models.Model):
 
     slug_field = models.SlugField(max_length=100)
 
=== modified file 'django_project/factory_tests/tests.py'
--- django_project/factory_tests/tests.py	2012-01-12 15:41:57 +0000
+++ django_project/factory_tests/tests.py	2012-02-07 23:04:22 +0000
@@ -55,6 +55,12 @@
         generated = generators.generate_unicode(field, self.factory)
         self.assertEquals(field.max_length, len(generated))
 
+    def test_generate_unicode_handles_None_max_length(self):
+        field = test_models.ModelWithNoneMaxLengthTextField._meta.get_field(
+                'text_field')
+        generated = generators.generate_unicode(field, self.factory)
+        self.assertIsInstance(generated, unicode)
+
     def test_generate_int_generates_int(self):
         generated = generators.generate_int(self.field, self.factory)
         self.assertIsInstance(generated, int)