Django

Code

Show
Ignore:
Timestamp:
07/01/07 00:55:01 (2 years ago)
Author:
mtredinnick
Message:

unicode: Merged changes from trunk up to [5579].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/unicode

    • Property svnmerge-integrated changed from /django/trunk:1-5530 to /django/trunk:1-5579
  • django/branches/unicode/django/db/models/fields/__init__.py

    r5531 r5580  
    176176    def get_db_prep_lookup(self, lookup_type, value): 
    177177        "Returns field's value prepared for database lookup." 
    178         if lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte', 'month', 'day', 'search'): 
     178        if lookup_type in ('exact', 'regex', 'iregex', 'gt', 'gte', 'lt', 'lte', 'month', 'day', 'search'): 
    179179            return [value] 
    180180        elif lookup_type in ('range', 'in'): 
     
    802802 
    803803class IPAddressField(Field): 
     804    empty_strings_allowed = False 
    804805    def __init__(self, *args, **kwargs): 
    805806        kwargs['maxlength'] = 15