Add support for GenericIPAddressField field

paulocheque · Jun 2, 2015 · c0254e3 · c0254e3
1 parent 3cffded
commit c0254e3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 0 deletions.
diff --git a/django_dynamic_fixture/fixture_algorithms/default_fixture.py b/django_dynamic_fixture/fixture_algorithms/default_fixture.py
@@ -26,6 +26,10 @@ def binaryfield_config(self, field, key):
     def uuidfield_config(self, field, key):
         return uuid.uuid4()
 
+    # Django >= 1.4
+    def genericipaddressfield_config(self, field, key):
+        return self.ipaddressfield_config(field, key)
+
 
 # GIS/GeoDjango
 class GeoDjangoDataFixture(object):

diff --git a/django_dynamic_fixture/fixture_algorithms/random_fixture.py b/django_dynamic_fixture/fixture_algorithms/random_fixture.py
@@ -92,6 +92,7 @@ def emailfield_config(self, field, key):
     def urlfield_config(self, field, key):
         return six.text_type('http://dynamicfixture%s.com') % self.random_string(10)
 
+    # Deprecated in Django >= 1.7
     def ipaddressfield_config(self, field, key):
         a = random.randint(1, 255)
         b = random.randint(1, 255)

diff --git a/django_dynamic_fixture/fixture_algorithms/sequential_fixture.py b/django_dynamic_fixture/fixture_algorithms/sequential_fixture.py
@@ -125,6 +125,7 @@ def emailfield_config(self, field, key):
     def urlfield_config(self, field, key):
         return six.text_type('http://dynamicfixture%s.com') % self.get_value(field, key)
 
+    # Deprecated in Django >= 1.7
     def ipaddressfield_config(self, field, key):
         # TODO: better workaround (this suppose ip field is not unique)
         data = self.get_value(field, key)

diff --git a/django_dynamic_fixture/fixture_algorithms/tests/abstract_test_generic_fixture.py b/django_dynamic_fixture/fixture_algorithms/tests/abstract_test_generic_fixture.py
@@ -7,6 +7,8 @@
 import six
 from six.moves import xrange
 
+from django_dynamic_fixture.django_helper import django_greater_than
+
 
 class DataFixtureTestCase(object):
     def setUp(self):
@@ -51,6 +53,8 @@ def test_formatted_strings(self):
         self.assertTrue(isinstance(self.fixture.generate_data(models.EmailField(max_length=100)), six.text_type))
         self.assertTrue(isinstance(self.fixture.generate_data(models.URLField(max_length=100)), six.text_type))
         self.assertTrue(isinstance(self.fixture.generate_data(models.IPAddressField(max_length=100)), six.text_type))
+        if django_greater_than('1.4'):
+            self.assertTrue(isinstance(self.fixture.generate_data(models.GenericIPAddressField(max_length=100)), six.text_type))
 
     def test_files(self):
         self.assertTrue(isinstance(self.fixture.generate_data(models.FilePathField(max_length=100)), six.text_type))

diff --git a/django_dynamic_fixture/fixture_algorithms/unique_random_fixture.py b/django_dynamic_fixture/fixture_algorithms/unique_random_fixture.py
@@ -149,6 +149,7 @@ def emailfield_config(self, field, key):
     def urlfield_config(self, field, key):
         return six.text_type('http://dynamicfixture%s.com') % self.random_string(field, key)
 
+    # Deprecated in Django >= 1.7
     def ipaddressfield_config(self, field, key):
         MAX_IP = 2 ** 32 - 1
 

diff --git a/django_dynamic_fixture/models_test.py b/django_dynamic_fixture/models_test.py
@@ -64,6 +64,8 @@ class ModelWithFieldsWithCustomValidation(models.Model):
     email = models.EmailField(null=True, unique=True)
     url = models.URLField(null=True, unique=True)
     ip = models.IPAddressField(null=True, unique=False)
+    if django_greater_than('1.4'):
+        ipv6 = models.GenericIPAddressField(null=True, unique=False)
 
     class Meta:
         verbose_name = 'Custom validation'

diff --git a/django_dynamic_fixture/tests/test_ddf.py b/django_dynamic_fixture/tests/test_ddf.py
@@ -86,6 +86,8 @@ def test_new_fill_formatted_strings_fields_with_basic_values(self):
         self.assertTrue(isinstance(instance.email, six.text_type))
         self.assertTrue(isinstance(instance.url, six.text_type))
         self.assertTrue(isinstance(instance.ip, six.text_type))
+        if django_greater_than('1.4'):
+            self.assertTrue(isinstance(instance.ipv6, six.text_type))
 
     def test_new_fill_file_fields_with_basic_strings(self):
         instance = self.ddf.new(ModelWithFileFields)