Django

Code

Changeset 2454

Show
Ignore:
Timestamp:
02/28/06 21:51:55 (3 years ago)
Author:
adrian
Message:

Fixed #1213 -- Changed value of NOT_PROVIDED so that it's not a string, to prevent possible (but highly unlikely) collisions. Thanks, akaihola

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/meta/fields.py

    r2343 r2454  
    77import datetime, os 
    88 
    9 # Random entropy string used by "default" param. 
    10 NOT_PROVIDED = 'oijpwojefiojpanv' 
     9class NOT_PROVIDED: 
     10    pass 
    1111 
    1212# Values for filter_interface. 
    …… 
    194194    def has_default(self): 
    195195        "Returns a boolean of whether this field has a default value." 
    196         return self.default != NOT_PROVIDED 
     196        return self.default is not NOT_PROVIDED 
    197197 
    198198    def get_default(self): 
    199199        "Returns the default value for this field." 
    200         if self.default != NOT_PROVIDED: 
     200        if self.default is not NOT_PROVIDED: 
    201201            if hasattr(self.default, '__get_value__'): 
    202202                return self.default.__get_value__()