Django

Code

Show
Ignore:
Timestamp:
07/19/08 08:30:47 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7917 to /django/trunk:1-7978

  • django/branches/gis/django/contrib/localflavor/ar/forms.py

    r7768 r7979  
    44""" 
    55 
    6 from django.newforms import ValidationError 
    7 from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES 
     6from django.forms import ValidationError 
     7from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.encoding import smart_unicode 
    99from django.utils.translation import ugettext_lazy as _ 

  • django/branches/gis/django/contrib/localflavor/au/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    7 from django.newforms.util import smart_unicode 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
     7from django.forms.util import smart_unicode 
    88from django.utils.translation import ugettext_lazy as _ 
    99import re 

  • django/branches/gis/django/contrib/localflavor/br/forms.py

    r7768 r7979  
    44""" 
    55 
    6 from django.newforms import ValidationError 
    7 from django.newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES 
     6from django.forms import ValidationError 
     7from django.forms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.encoding import smart_unicode 
    99from django.utils.translation import ugettext_lazy as _ 

  • django/branches/gis/django/contrib/localflavor/ca/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    7 from django.newforms.util import smart_unicode 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
     7from django.forms.util import smart_unicode 
    88from django.utils.translation import ugettext_lazy as _ 
    99import re 

  • django/branches/gis/django/contrib/localflavor/ch/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    88from django.utils.translation import ugettext_lazy as _ 

  • django/branches/gis/django/contrib/localflavor/cl/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import RegexField, Select, EMPTY_VALUES 
     5from django.forms import ValidationError 
     6from django.forms.fields import RegexField, Select, EMPTY_VALUES 
    77from django.utils.translation import ugettext_lazy as _ 
    88from django.utils.encoding import smart_unicode 

  • django/branches/gis/django/contrib/localflavor/de/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.translation import ugettext_lazy as _ 
    88import re 

  • django/branches/gis/django/contrib/localflavor/es/forms.py

    r7768 r7979  
    44""" 
    55 
    6 from django.newforms import ValidationError 
    7 from django.newforms.fields import RegexField, Select, EMPTY_VALUES 
     6from django.forms import ValidationError 
     7from django.forms.fields import RegexField, Select, EMPTY_VALUES 
    88from django.utils.translation import ugettext_lazy as _ 
    99import re 

  • django/branches/gis/django/contrib/localflavor/fi/forms.py

    r7768 r7979  
    44 
    55import re 
    6 from django.newforms import ValidationError 
    7 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
     6from django.forms import ValidationError 
     7from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
    88from django.utils.translation import ugettext_lazy as _ 
    99 

  • django/branches/gis/django/contrib/localflavor/fr/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    88from django.utils.translation import ugettext_lazy as _ 

  • django/branches/gis/django/contrib/localflavor/generic/forms.py

    r7354 r7979  
    1 from django import newforms as forms 
     1from django import forms 
    22 
    33DEFAULT_DATE_INPUT_FORMATS = ( 

  • django/branches/gis/django/contrib/localflavor/in_/forms.py

    r6990 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    88from django.utils.translation import gettext 

  • django/branches/gis/django/contrib/localflavor/is_/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import RegexField, EMPTY_VALUES 
    7 from django.newforms.widgets import Select 
     5from django.forms import ValidationError 
     6from django.forms.fields import RegexField, EMPTY_VALUES 
     7from django.forms.widgets import Select 
    88from django.utils.translation import ugettext_lazy as _ 
    99from django.utils.encoding import smart_unicode 

  • django/branches/gis/django/contrib/localflavor/it/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.translation import ugettext_lazy as _ 
    88from django.utils.encoding import smart_unicode 

  • django/branches/gis/django/contrib/localflavor/jp/forms.py

    r7768 r7979  
    44 
    55from django.core import validators 
    6 from django.newforms import ValidationError 
     6from django.forms import ValidationError 
    77from django.utils.translation import ugettext_lazy as _ 
    8 from django.newforms.fields import RegexField, Select 
     8from django.forms.fields import RegexField, Select 
    99 
    1010class JPPostalCodeField(RegexField): 

  • django/branches/gis/django/contrib/localflavor/mx/forms.py

    r7354 r7979  
    33""" 
    44 
    5 from django.newforms.fields import Select 
     5from django.forms.fields import Select 
    66 
    77class MXStateSelect(Select): 

  • django/branches/gis/django/contrib/localflavor/nl/forms.py

    r7768 r7979  
    55import re 
    66 
    7 from django.newforms import ValidationError 
    8 from django.newforms.fields import Field, Select, EMPTY_VALUES 
     7from django.forms import ValidationError 
     8from django.forms.fields import Field, Select, EMPTY_VALUES 
    99from django.utils.translation import ugettext_lazy as _ 
    1010from django.utils.encoding import smart_unicode 

  • django/branches/gis/django/contrib/localflavor/no/forms.py

    r7768 r7979  
    44 
    55import re, datetime 
    6 from django.newforms import ValidationError 
    7 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
     6from django.forms import ValidationError 
     7from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
    88from django.utils.translation import ugettext_lazy as _ 
    99 

  • django/branches/gis/django/contrib/localflavor/pe/forms.py

    r7768 r7979  
    44""" 
    55 
    6 from django.newforms import ValidationError 
    7 from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES 
     6from django.forms import ValidationError 
     7from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.translation import ugettext_lazy as _ 
    99 

  • django/branches/gis/django/contrib/localflavor/pl/forms.py

    r7768 r7979  
    55import re 
    66 
    7 from django.newforms import ValidationError 
    8 from django.newforms.fields import Select, RegexField 
     7from django.forms import ValidationError 
     8from django.forms.fields import Select, RegexField 
    99from django.utils.translation import ugettext_lazy as _ 
    1010 

  • django/branches/gis/django/contrib/localflavor/sk/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms.fields import Select, RegexField 
     5from django.forms.fields import Select, RegexField 
    66from django.utils.translation import ugettext_lazy as _ 
    77 

  • django/branches/gis/django/contrib/localflavor/uk/forms.py

    r7768 r7979  
    55import re 
    66 
    7 from django.newforms.fields import CharField, Select 
    8 from django.newforms import ValidationError 
     7from django.forms.fields import CharField, Select 
     8from django.forms import ValidationError 
    99from django.utils.translation import ugettext_lazy as _ 
    1010 

  • django/branches/gis/django/contrib/localflavor/us/forms.py

    r7768 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    88from django.utils.translation import ugettext_lazy as _ 

  • django/branches/gis/django/contrib/localflavor/za/forms.py

    r7354 r7979  
    33""" 
    44 
    5 from django.newforms import ValidationError 
    6 from django.newforms.fields import Field, RegexField, EMPTY_VALUES 
     5from django.forms import ValidationError 
     6from django.forms.fields import Field, RegexField, EMPTY_VALUES 
    77from django.utils.checksums import luhn 
    88from django.utils.translation import gettext as _