Django

Code

Changeset 4954

Show
Ignore:
Timestamp:
04/08/07 06:21:00 (1 year ago)
Author:
russellm
Message:

Backwards-incompatible change -- Renamed localflavor.usa to localflavor.us to match naming of other flavors.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/models/fields/__init__.py

    r4752 r4954  
    762762 
    763763    def formfield(self, **kwargs): 
    764         from django.contrib.localflavor.usa.forms import USPhoneNumberField 
     764        from django.contrib.localflavor.us.forms import USPhoneNumberField 
    765765        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    766766        defaults.update(kwargs) 

  • django/trunk/tests/regressiontests/forms/localflavor.py

    r4939 r4954  
    77USZipCodeField validates that the data is either a five-digit U.S. zip code or 
    88a zip+4. 
    9 >>> from django.contrib.localflavor.usa.forms import USZipCodeField 
     9>>> from django.contrib.localflavor.us.forms import USZipCodeField 
    1010>>> f = USZipCodeField() 
    1111>>> f.clean('60606') 
    …… 
    6868USPhoneNumberField validates that the data is a valid U.S. phone number, 
    6969including the area code. It's normalized to XXX-XXX-XXXX format. 
    70 >>> from django.contrib.localflavor.usa.forms import USPhoneNumberField 
     70>>> from django.contrib.localflavor.us.forms import USPhoneNumberField 
    7171>>> f = USPhoneNumberField() 
    7272>>> f.clean('312-555-1212') 
    …… 
    137137USStateField validates that the data is either an abbreviation or name of a 
    138138U.S. state. 
    139 >>> from django.contrib.localflavor.usa.forms import USStateField 
     139>>> from django.contrib.localflavor.us.forms import USStateField 
    140140>>> f = USStateField() 
    141141>>> f.clean('il') 
    …… 
    182182USStateSelect is a Select widget that uses a list of U.S. states/territories 
    183183as its choices. 
    184 >>> from django.contrib.localflavor.usa.forms import USStateSelect 
     184>>> from django.contrib.localflavor.us.forms import USStateSelect 
    185185>>> w = USStateSelect() 
    186186>>> print w.render('state', 'IL') 
    …… 
    248248 
    249249# USSocialSecurityNumberField ################################################# 
    250 >>> from django.contrib.localflavor.usa.forms import USSocialSecurityNumberField 
     250>>> from django.contrib.localflavor.us.forms import USSocialSecurityNumberField 
    251251>>> f = USSocialSecurityNumberField() 
    252252>>> f.clean('987-65-4330')