mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Fixed #1084 -- Added some missing imports. Thanks, nesh

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2005-12-19 14:32:08 +00:00
parent 79b57ab50b
commit d828a40cb8
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
django/db/models/base.py
View File

@@ -10,6 +10,7 @@ from django.db.models import signals
from django.dispatch import dispatcher from django.dispatch import dispatcher
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.utils.functional import curry from django.utils.functional import curry
from django.conf import settings
import re import re
import types import types
import sys import sys
@@ -28,10 +29,8 @@ class ModelBase(type):
# Create the class. # Create the class.
new_class = type.__new__(cls, name, bases, {'__module__': attrs.pop('__module__')}) new_class = type.__new__(cls, name, bases, {'__module__': attrs.pop('__module__')})
new_class.add_to_class('_meta', new_class.add_to_class('_meta', Options(attrs.pop('META', None)))
Options(attrs.pop('META', None))) new_class.add_to_class('DoesNotExist', types.ClassType('DoesNotExist', (ObjectDoesNotExist,), {}))
new_class.add_to_class('DoesNotExist',
types.ClassType('DoesNotExist', (ObjectDoesNotExist,), {}) )
#Figure out the app_label by looking one level up. #Figure out the app_label by looking one level up.
#FIXME: wrong for nested model modules #FIXME: wrong for nested model modules

14
django/db/models/manipulators.py
View File

@@ -1,8 +1,11 @@
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.core import formfields
from django.core.formfields import Manipulator from django.core.formfields import Manipulator
from django.db.models.fields import FileField, AutoField from django.db.models.fields import FileField, AutoField
from django.db.models.fields.related import ManyToOne
from django.dispatch import dispatcher from django.dispatch import dispatcher
from django.db.models import signals from django.db.models import signals
from django.utils.functional import curry
def add_manipulators(sender): def add_manipulators(sender):
cls = sender cls = sender
@@ -51,14 +54,14 @@ class AutomaticManipulator(Manipulator):
cls.manager = model._default_manager cls.manager = model._default_manager
cls.opts = model._meta cls.opts = model._meta
for field_name_list in cls.opts.unique_together: for field_name_list in cls.opts.unique_together:
setattr(cls, 'isUnique%s' % '_'.join(field_name_list), curry(manipulator_validator_unique_together, field_name_list, opts)) setattr(cls, 'isUnique%s' % '_'.join(field_name_list), curry(manipulator_validator_unique_together, field_name_list, cls.opts))
for f in cls.opts.fields: for f in cls.opts.fields:
if f.unique_for_date: if f.unique_for_date:
setattr(cls, 'isUnique%sFor%s' % (f.name, f.unique_for_date), curry(manipulator_validator_unique_for_date, f, opts.get_field(f.unique_for_date), opts, 'date')) setattr(cls, 'isUnique%sFor%s' % (f.name, f.unique_for_date), curry(manipulator_validator_unique_for_date, f, cls.opts.get_field(f.unique_for_date), cls.opts, 'date'))
if f.unique_for_month: if f.unique_for_month:
setattr(cls, 'isUnique%sFor%s' % (f.name, f.unique_for_month), curry(manipulator_validator_unique_for_date, f, opts.get_field(f.unique_for_month), opts, 'month')) setattr(cls, 'isUnique%sFor%s' % (f.name, f.unique_for_month), curry(manipulator_validator_unique_for_date, f, cls.opts.get_field(f.unique_for_month), cls.opts, 'month'))
if f.unique_for_year: if f.unique_for_year:
setattr(cls, 'isUnique%sFor%s' % (f.name, f.unique_for_year), curry(manipulator_validator_unique_for_date, f, opts.get_field(f.unique_for_year), opts, 'year')) setattr(cls, 'isUnique%sFor%s' % (f.name, f.unique_for_year), curry(manipulator_validator_unique_for_date, f, cls.opts.get_field(f.unique_for_year), cls.opts, 'year'))
_prepare = classmethod(_prepare) _prepare = classmethod(_prepare)
def contribute_to_class(cls, other_cls, name ): def contribute_to_class(cls, other_cls, name ):
@@ -310,7 +313,6 @@ def manipulator_validator_unique_together(field_name_list, opts, self, field_dat
def manipulator_validator_unique_for_date(from_field, date_field, opts, lookup_type, self, field_data, all_data): def manipulator_validator_unique_for_date(from_field, date_field, opts, lookup_type, self, field_data, all_data):
date_str = all_data.get(date_field.get_manipulator_field_names('')[0], None) date_str = all_data.get(date_field.get_manipulator_field_names('')[0], None)
mod = opts.get_model_module()
date_val = formfields.DateField.html2python(date_str) date_val = formfields.DateField.html2python(date_str)
if date_val is None: if date_val is None:
return # Date was invalid. This will be caught by another validator. return # Date was invalid. This will be caught by another validator.
@@ -324,7 +326,7 @@ def manipulator_validator_unique_for_date(from_field, date_field, opts, lookup_t
if lookup_type == 'date': if lookup_type == 'date':
lookup_kwargs['%s__day' % date_field.name] = date_val.day lookup_kwargs['%s__day' % date_field.name] = date_val.day
try: try:
old_obj = mod.get_object(**lookup_kwargs) old_obj = opts.model._default_manager.get_object(**lookup_kwargs)
except ObjectDoesNotExist: except ObjectDoesNotExist:
return return
else: else: