Ticket #8664: 8664-1.2.diff

django/db/models/fields/__init__.py

@@ -725 +725 @@
         defaults.update(kwargs)
         return super(NullBooleanField, self).formfield(**defaults)
 
-class PhoneNumberField(Field):
-    def get_internal_type(self):
-        return "PhoneNumberField"
-
-    def formfield(self, **kwargs):
-        from django.contrib.localflavor.us.forms import USPhoneNumberField
-        defaults = {'form_class': USPhoneNumberField}
-        defaults.update(kwargs)
-        return super(PhoneNumberField, self).formfield(**defaults)
-
 class PositiveIntegerField(IntegerField):
     def get_internal_type(self):
         return "PositiveIntegerField"

django/contrib/localflavor/us/models.py

@@ +1 @@
+from django.db.models.fields import Field
+
+class PhoneNumberField(Field):
+    def get_internal_type(self):
+        return "PhoneNumberField"
+
+    def formfield(self, **kwargs):
+        from django.contrib.localflavor.us.forms import USPhoneNumberField
+        defaults = {'form_class': USPhoneNumberField}
+        defaults.update(kwargs)
+        return super(PhoneNumberField, self).formfield(**defaults)

tests/modeltests/model_forms/models.py

@@ -70 +70 @@
     pass
 
 class PhoneNumber(models.Model):
-    phone = models.PhoneNumberField()
+    from django.contrib.localflavor.us.models import PhoneNumberField
+    phone = PhoneNumberField()
     description = models.CharField(max_length=20)
 
     def __unicode__(self):

tests/regressiontests/serializers_regress/models.py

@@ -8 +8 @@
 from django.db import models
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
+from django.contrib.localflavor.us.models import PhoneNumberField
 
 # The following classes are for testing basic data
 # marshalling, including NULL values.
@@ -52 +53 @@
     data = models.NullBooleanField(null=True)
 
 class PhoneData(models.Model):
-    data = models.PhoneNumberField(null=True)
+    data = PhoneNumberField(null=True)
 
 class PositiveIntegerData(models.Model):
     data = models.PositiveIntegerField(null=True)
@@ -188 +189 @@
 #     data = models.NullBooleanField(primary_key=True)
 
 class PhonePKData(models.Model):
-    data = models.PhoneNumberField(primary_key=True)
+    data = PhoneNumberField(primary_key=True)
 
 class PositiveIntegerPKData(models.Model):
     data = models.PositiveIntegerField(primary_key=True)
@@ -251 +252 @@
 class ExplicitInheritBaseModel(BaseModel):
     parent = models.OneToOneField(BaseModel)
     child_data = models.IntegerField()