mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: More small code cleanups

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-12-18 20:41:47 +00:00
parent fc27500389
commit 5907e9337f
2 changed files with 43 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
django/db/models/fields/related.py
View File

@ -1,10 +1,9 @@
from django.db.models import signals
from django.db.models.fields import Field, IntegerField from django.db.models.fields import Field, IntegerField
from django.db.models.related import RelatedObject from django.db.models.related import RelatedObject
from django.utils.translation import gettext_lazy, string_concat from django.utils.translation import gettext_lazy, string_concat
from django.utils.functional import curry from django.utils.functional import curry
from django.core import formfields from django.core import formfields
from django.db.models import signals
from django.dispatch import dispatcher from django.dispatch import dispatcher
# Values for Relation.edit_inline. # Values for Relation.edit_inline.
@ -12,35 +11,33 @@ TABULAR, STACKED = 1, 2
RECURSIVE_RELATIONSHIP_CONSTANT = 'self' RECURSIVE_RELATIONSHIP_CONSTANT = 'self'
#HACK #HACK
class RelatedField(object): class RelatedField(object):
pending_lookups = {} pending_lookups = {}
dispatcher.connect( dispatcher.connect(
lambda sender: RelatedField.do_pending_lookups(sender) , lambda sender: RelatedField.do_pending_lookups(sender),
signal = signals.class_prepared, signal = signals.class_prepared,
weak = False) weak = False)
def add_lookup(cls, rel_cls, field): def add_lookup(cls, rel_cls, field):
name = field.rel.to name = field.rel.to
module = rel_cls.__module__ module = rel_cls.__module__
key = (module, name) key = (module, name)
cls.pending_lookups.setdefault(key,[]).append( (rel_cls, field) ) cls.pending_lookups.setdefault(key, []).append((rel_cls, field))
add_lookup = classmethod(add_lookup) add_lookup = classmethod(add_lookup)
def do_pending_lookups(cls, other_cls): def do_pending_lookups(cls, other_cls):
key = (other_cls.__module__, other_cls.__name__) key = (other_cls.__module__, other_cls.__name__)
for (rel_cls,field) in cls.pending_lookups.setdefault(key,[]): for rel_cls, field in cls.pending_lookups.setdefault(key,[]):
field.rel.to = other_cls field.rel.to = other_cls
field.do_related_class(other_cls, rel_cls) field.do_related_class(other_cls, rel_cls)
do_pending_lookups = classmethod(do_pending_lookups) do_pending_lookups = classmethod(do_pending_lookups)
def contribute_to_class(self, cls, name): def contribute_to_class(self, cls, name):
sup = super(RelatedField,self) sup = super(RelatedField, self)
if hasattr(sup, 'contribute_to_class'): if hasattr(sup, 'contribute_to_class'):
sup.contribute_to_class(cls,name) sup.contribute_to_class(cls, name)
other = self.rel.to other = self.rel.to
if isinstance(other, basestring): if isinstance(other, basestring):
if other == RECURSIVE_RELATIONSHIP_CONSTANT: if other == RECURSIVE_RELATIONSHIP_CONSTANT:
@ -53,18 +50,17 @@ class RelatedField(object):
self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name) self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name)
self.verbose_name = self.verbose_name or self.rel.to._meta.verbose_name self.verbose_name = self.verbose_name or self.rel.to._meta.verbose_name
self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name
def do_related_class(self, other, cls): def do_related_class(self, other, cls):
self.set_attributes_from_rel() self.set_attributes_from_rel()
related = RelatedObject(other._meta, cls, self) related = RelatedObject(other._meta, cls, self)
self.contribute_to_related_class(other, related) self.contribute_to_related_class(other, related)
#HACK #HACK
class SharedMethods(RelatedField): class SharedMethods(RelatedField):
def get_attname(self): def get_attname(self):
return '%s_id' % self.name return '%s_id' % self.name
def get_validator_unique_lookup_type(self): def get_validator_unique_lookup_type(self):
return '%s__%s__exact' % (self.name, self.rel.get_related_field().name) return '%s__%s__exact' % (self.name, self.rel.get_related_field().name)
@ -74,13 +70,13 @@ class SharedMethods(RelatedField):
# EXAMPLES: Choice.get_poll(), Story.get_dateline() # EXAMPLES: Choice.get_poll(), Story.get_dateline()
setattr(cls, 'get_%s' % self.name, curry(cls._get_foreign_key_object, field_with_rel=self)) setattr(cls, 'get_%s' % self.name, curry(cls._get_foreign_key_object, field_with_rel=self))
class ForeignKey(SharedMethods,Field): class ForeignKey(SharedMethods, Field):
empty_strings_allowed = False empty_strings_allowed = False
def __init__(self, to, to_field=None, **kwargs): def __init__(self, to, to_field=None, **kwargs):
try: try:
to_name = to._meta.object_name.lower() to_name = to._meta.object_name.lower()
except AttributeError: # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT except AttributeError: # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT
assert isinstance(to, basestring) , """ForeignKey(%r) is invalid. First parameter to ForeignKey must be either assert isinstance(to, basestring) , """ForeignKey(%r) is invalid. First parameter to ForeignKey must be either
a model, a model name, or the string %r""" % (to, RECURSIVE_RELATIONSHIP_CONSTANT) a model, a model name, or the string %r""" % (to, RECURSIVE_RELATIONSHIP_CONSTANT)
kwargs['verbose_name'] = kwargs.get('verbose_name', '') kwargs['verbose_name'] = kwargs.get('verbose_name', '')
else: else:
@ -103,13 +99,13 @@ class ForeignKey(SharedMethods,Field):
lookup_overrides=kwargs.pop('lookup_overrides', None), lookup_overrides=kwargs.pop('lookup_overrides', None),
raw_id_admin=kwargs.pop('raw_id_admin', False)) raw_id_admin=kwargs.pop('raw_id_admin', False))
Field.__init__(self, **kwargs) Field.__init__(self, **kwargs)
if not self.db_index: if not self.db_index:
self.db_index = True self.db_index = True
def prepare_field_objs_and_params(self, manipulator, name_prefix): def prepare_field_objs_and_params(self, manipulator, name_prefix):
params = {'validator_list': self.validator_list[:]} params = {'validator_list': self.validator_list[:]}
params['member_name'] = name_prefix + self.attname params['member_name'] = name_prefix + self.attname
if self.rel.raw_id_admin: if self.rel.raw_id_admin:
field_objs = self.get_manipulator_field_objs() field_objs = self.get_manipulator_field_objs()
@ -124,7 +120,7 @@ class ForeignKey(SharedMethods,Field):
else: else:
field_objs = [formfields.SelectField] field_objs = [formfields.SelectField]
params['choices'] = self.get_choices_default() params['choices'] = self.get_choices_default()
return (field_objs,params) return (field_objs, params)
def get_manipulator_field_objs(self): def get_manipulator_field_objs(self):
rel_field = self.rel.get_related_field() rel_field = self.rel.get_related_field()
@ -133,7 +129,7 @@ class ForeignKey(SharedMethods,Field):
else: else:
return [formfields.IntegerField] return [formfields.IntegerField]
def get_db_prep_save(self,value): def get_db_prep_save(self, value):
if value == '' or value == None: if value == '' or value == None:
return None return None
else: else:
@ -170,10 +166,9 @@ class ForeignKey(SharedMethods,Field):
# but only for related objects that are in the same app. # but only for related objects that are in the same app.
# EXAMPLE: Poll.add_choice() # EXAMPLE: Poll.add_choice()
if related.opts.app_label == cls._meta.app_label: if related.opts.app_label == cls._meta.app_label:
func = lambda self, *args, **kwargs: self._add_related(related.model, related.field, *args, **kwargs) func = lambda self, *args, **kwargs: self._add_related(related.model, related.field, *args, **kwargs)
setattr(cls, 'add_%s' % rel_obj_name, func) setattr(cls, 'add_%s' % rel_obj_name, func)
class OneToOneField(SharedMethods, IntegerField): class OneToOneField(SharedMethods, IntegerField):
def __init__(self, to, to_field=None, **kwargs): def __init__(self, to, to_field=None, **kwargs):
kwargs['verbose_name'] = kwargs.get('verbose_name', 'ID') kwargs['verbose_name'] = kwargs.get('verbose_name', 'ID')
@ -205,7 +200,7 @@ class OneToOneField(SharedMethods, IntegerField):
rel_class=related.model, rel_field=related.field)) rel_class=related.model, rel_field=related.field))
class ManyToManyField(RelatedField,Field): class ManyToManyField(RelatedField, Field):
def __init__(self, to, **kwargs): def __init__(self, to, **kwargs):
kwargs['verbose_name'] = kwargs.get('verbose_name', None) kwargs['verbose_name'] = kwargs.get('verbose_name', None)
kwargs['rel'] = ManyToMany(to, kwargs.pop('singular', None), kwargs['rel'] = ManyToMany(to, kwargs.pop('singular', None),
@ -222,7 +217,7 @@ class ManyToManyField(RelatedField,Field):
else: else:
msg = gettext_lazy(' Hold down "Control", or "Command" on a Mac, to select more than one.') msg = gettext_lazy(' Hold down "Control", or "Command" on a Mac, to select more than one.')
self.help_text = string_concat( self.help_text , msg ) self.help_text = string_concat( self.help_text , msg )
def get_manipulator_field_objs(self): def get_manipulator_field_objs(self):
if self.rel.raw_id_admin: if self.rel.raw_id_admin:
@ -304,18 +299,18 @@ class ManyToManyFieldNew(RelatedField):
self.from_ = None self.from_ = None
self.rel = self self.rel = self
self.edit_inline = False self.edit_inline = False
def set_attributes_from_rel(self): def set_attributes_from_rel(self):
pass pass
def contribute_to_class(self, cls, name): def contribute_to_class(self, cls, name):
self.from_ = cls self.from_ = cls
self.name = name self.name = name
super(ManyToManyFieldNew, self).contribute_to_class(cls, name) super(ManyToManyFieldNew, self).contribute_to_class(cls, name)
def contribute_to_related_class(self, cls, name): def contribute_to_related_class(self, cls, name):
#Now we know both classes exist. #Now we know both classes exist.
self.to = cls self.to = cls
# We need to wait until the class we were in was fully defined # We need to wait until the class we were in was fully defined
dispatcher.connect( dispatcher.connect(
@ -323,23 +318,21 @@ class ManyToManyFieldNew(RelatedField):
signal = signals.class_prepared, signal = signals.class_prepared,
sender = self.from_ sender = self.from_
) )
def from_prepared(self): def from_prepared(self):
from django.db.models.base import Model from django.db.models.base import Model
class M2M(Model): class M2M(Model):
__module__ = self.from_.__module__ __module__ = self.from_.__module__
id_to = self.from_._meta.db_table id_to = self.from_._meta.db_table
id_from = self.to._meta.db_table id_from = self.to._meta.db_table
M2M.add_to_class(id_from, ForeignKey(to=self.from_) ) M2M.add_to_class(id_from, ForeignKey(to=self.from_))
M2M.add_to_class(id_to, ForeignKey(to=self.to) ) M2M.add_to_class(id_to, ForeignKey(to=self.to))
M2M._meta.db_table = '%s_%s' % (self.from_._meta.db_table, self.name) M2M._meta.db_table = '%s_%s' % (self.from_._meta.db_table, self.name)
M2M._meta.unique_together = ((id_to, id_from),) M2M._meta.unique_together = ((id_to, id_from),)
M2M.__name__ = "M2M_%s_%s_%s" % (self.name,self.from_.__name__, self.to.__name__) M2M.__name__ = "M2M_%s_%s_%s" % (self.name, self.from_.__name__, self.to.__name__)
class ManyToOne: class ManyToOne:
def __init__(self, to, field_name, num_in_admin=3, min_num_in_admin=None, def __init__(self, to, field_name, num_in_admin=3, min_num_in_admin=None,
@ -372,12 +365,11 @@ class OneToOne(ManyToOne):
self.lookup_overrides = lookup_overrides or {} self.lookup_overrides = lookup_overrides or {}
self.raw_id_admin = raw_id_admin self.raw_id_admin = raw_id_admin
class ManyToMany: class ManyToMany:
def __init__(self, to, singular=None, num_in_admin=0, related_name=None, def __init__(self, to, singular=None, num_in_admin=0, related_name=None,
filter_interface=None, limit_choices_to=None, raw_id_admin=False): filter_interface=None, limit_choices_to=None, raw_id_admin=False):
self.to = to self.to = to
self.singular = singular or None self.singular = singular or None
self.num_in_admin = num_in_admin self.num_in_admin = num_in_admin
self.related_name = related_name self.related_name = related_name
self.filter_interface = filter_interface self.filter_interface = filter_interface

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

@ -6,8 +6,8 @@ from django.db.models import signals
def add_manipulators(sender): def add_manipulators(sender):
cls = sender cls = sender
cls.add_to_class( 'AddManipulator', ModelAddManipulator) cls.add_to_class('AddManipulator', ModelAddManipulator)
cls.add_to_class( 'ChangeManipulator', ModelChangeManipulator) cls.add_to_class('ChangeManipulator', ModelChangeManipulator)
dispatcher.connect( dispatcher.connect(
add_manipulators, add_manipulators,
@ -28,8 +28,8 @@ class ManipulatorDescriptor(object):
raise "Manipulator can not be accessed via instance" raise "Manipulator can not be accessed via instance"
else: else:
if not self.man: if not self.man:
# Create a class which inherits from the MANIPULATOR class given in the class, # Create a class which inherits from the MANIPULATOR class given in the class,
# and the appropriate automatic manipulator, # and the appropriate automatic manipulator,
class Man(self.get_base_manipulator(type), self.base): class Man(self.get_base_manipulator(type), self.base):
pass pass
@ -39,14 +39,12 @@ class ManipulatorDescriptor(object):
return self.man return self.man
def get_base_manipulator(self, type): def get_base_manipulator(self, type):
if hasattr(type, 'MANIPULATOR'): if hasattr(type, 'MANIPULATOR'):
man = type.MANIPULATOR man = type.MANIPULATOR
else: else:
man = self.empty man = self.empty
return man return man
class AutomaticManipulator(Manipulator): class AutomaticManipulator(Manipulator):
def _prepare(cls, model): def _prepare(cls, model):
cls.model = model cls.model = model
@ -235,11 +233,11 @@ class AutomaticManipulator(Manipulator):
return self.opts.get_followed_related_objects(self.follow) return self.opts.get_followed_related_objects(self.follow)
def flatten_data(self): def flatten_data(self):
new_data = {} new_data = {}
for f in self.opts.get_data_holders(self.follow): for f in self.opts.get_data_holders(self.follow):
fol = self.follow.get(f.name) fol = self.follow.get(f.name)
new_data.update(f.flatten_data(fol, self.original_object)) new_data.update(f.flatten_data(fol, self.original_object))
return new_data return new_data
class ModelAddManipulator(AutomaticManipulator): class ModelAddManipulator(AutomaticManipulator):
change = False change = False
@ -276,12 +274,9 @@ class ModelChangeManipulator(AutomaticManipulator):
super(ModelChangeManipulator, self).__init__(original_object=original_object, follow=follow) super(ModelChangeManipulator, self).__init__(original_object=original_object, follow=follow)
self.original_object = original_object self.original_object = original_object
if self.opts.get_ordered_objects(): if self.opts.get_ordered_objects():
self.fields.append(formfields.CommaSeparatedIntegerField(field_name="order_")) self.fields.append(formfields.CommaSeparatedIntegerField(field_name="order_"))
def manipulator_validator_unique_together(field_name_list, opts, self, field_data, all_data): def manipulator_validator_unique_together(field_name_list, opts, self, field_data, all_data):
from django.utils.text import get_text_list from django.utils.text import get_text_list
field_list = [opts.get_field(field_name) for field_name in field_name_list] field_list = [opts.get_field(field_name) for field_name in field_name_list]