Django

Code

Changeset 6623

Show
Ignore:
Timestamp:
10/27/07 22:38:08 (1 year ago)
Author:
gwilson
Message:

Removed duplicate decimal import.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/newforms/fields.py

    r6578 r6623  
    11""" 
    2 Field classes 
     2Field classes. 
    33""" 
    44 
     
    77import re 
    88import time 
    9  
    10 from django.utils.translation import ugettext 
    11 from django.utils.encoding import StrAndUnicode, smart_unicode 
    12  
    13 from util import ErrorList, ValidationError 
    14 from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput 
    15  
     9# Python 2.3 fallbacks 
    1610try: 
    1711    from decimal import Decimal, DecimalException 
    1812except ImportError: 
    1913    from django.utils._decimal import Decimal, DecimalException 
     14try: 
     15    set 
     16except NameError: 
     17    from sets import Set as set 
     18 
     19from django.utils.translation import ugettext 
     20from django.utils.encoding import StrAndUnicode, smart_unicode 
     21 
     22from util import ErrorList, ValidationError 
     23from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput 
     24 
    2025 
    2126__all__ = ( 
     
    2429    'DEFAULT_TIME_INPUT_FORMATS', 'TimeField', 
    2530    'DEFAULT_DATETIME_INPUT_FORMATS', 'DateTimeField', 
    26     'RegexField', 'EmailField', 'FileField', 'ImageField', 'URLField', 'BooleanField', 
    27     'ChoiceField', 'NullBooleanField', 'MultipleChoiceField', 
     31    'RegexField', 'EmailField', 'FileField', 'ImageField', 'URLField', 
     32    'BooleanField', 'NullBooleanField', 'ChoiceField', 'MultipleChoiceField', 
    2833    'ComboField', 'MultiValueField', 'FloatField', 'DecimalField', 
    2934    'SplitDateTimeField', 'IPAddressField', 
     
    3338EMPTY_VALUES = (None, '') 
    3439 
    35 try: 
    36     set 
    37 except NameError: 
    38     from sets import Set as set   # Python 2.3 fallback 
    39  
    40 try: 
    41     from decimal import Decimal 
    42 except ImportError: 
    43     from django.utils._decimal import Decimal   # Python 2.3 fallback 
    4440 
    4541class Field(object):