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

magic-removal: Tiny code cleanups in db.models modules, and removed ManyToManyFieldNew (which was never finished)

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-17 17:23:18 +00:00
parent 464271a273
commit 05c3097f0f
4 changed files with 19 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,17 +100,14 @@ class ForeignKey(SharedMethods, Field):
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)
self.db_index = True
for name in ('num_in_admin', 'min_num_in_admin', 'max_num_in_admin', 'num_extra_on_change'): for name in ('num_in_admin', 'min_num_in_admin', 'max_num_in_admin', 'num_extra_on_change'):
if name in kwargs: if name in kwargs:
self.deprecated_args.append(name) self.deprecated_args.append(name)
if not self.db_index:
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[:], '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()
params['validator_list'].append(curry(manipulator_valid_rel_key, self, manipulator)) params['validator_list'].append(curry(manipulator_valid_rel_key, self, manipulator))
@ -124,7 +121,7 @@ class ForeignKey(SharedMethods, Field):
else: else:
field_objs = [forms.SelectField] field_objs = [forms.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()
@ -192,13 +189,12 @@ class OneToOneField(SharedMethods, IntegerField):
kwargs['primary_key'] = True kwargs['primary_key'] = True
IntegerField.__init__(self, **kwargs) IntegerField.__init__(self, **kwargs)
self.db_index = True
for name in ('num_in_admin'): for name in ('num_in_admin'):
if name in kwargs: if name in kwargs:
self.deprecated_args.append(name) self.deprecated_args.append(name)
if not self.db_index:
self.db_index = True
def contribute_to_related_class(self, cls, related): def contribute_to_related_class(self, cls, related):
rel_obj_name = related.get_method_name_part() rel_obj_name = related.get_method_name_part()
# Add "get_thingie" methods for one-to-one related objects. # Add "get_thingie" methods for one-to-one related objects.
@ -224,14 +220,12 @@ class ManyToManyField(RelatedField, Field):
if name in kwargs: if name in kwargs:
self.deprecated_args.append(name) self.deprecated_args.append(name)
if self.rel.raw_id_admin: if self.rel.raw_id_admin:
msg = gettext_lazy('Separate multiple IDs with commas.') msg = gettext_lazy('Separate multiple IDs with commas.')
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:
return [forms.RawIdAdminField] return [forms.RawIdAdminField]
@ -306,43 +300,6 @@ class ManyToManyField(RelatedField, Field):
def set_attributes_from_rel(self): def set_attributes_from_rel(self):
pass pass
class ManyToManyFieldNew(RelatedField):
def __init__(self, to, **kwargs):
self.to = to
self.from_ = None
self.rel = self
self.edit_inline = False
def set_attributes_from_rel(self):
pass
def contribute_to_class(self, cls, name):
self.from_ = cls
self.name = name
super(ManyToManyFieldNew, self).contribute_to_class(cls, name)
def contribute_to_related_class(self, cls, name):
#Now we know both classes exist.
self.to = cls
# We need to wait until the class we were in was fully defined
dispatcher.connect(self.from_prepared, signal=signals.class_prepared, sender=self.from_)
def from_prepared(self):
from django.db.models.base import Model
class M2M(Model):
__module__ = self.from_.__module__
id_to = self.from_._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_to, ForeignKey(to=self.to))
M2M._meta.db_table = '%s_%s' % (self.from_._meta.db_table, self.name)
M2M._meta.unique_together = ((id_to, id_from),)
M2M.__name__ = "M2M_%s_%s_%s" % (self.name, self.from_.__name__, self.to.__name__)
class ManyToOne: class ManyToOne:
def __init__(self, to, field_name, edit_inline=False, def __init__(self, to, field_name, edit_inline=False,
related_name=None, limit_choices_to=None, lookup_overrides=None, raw_id_admin=False): related_name=None, limit_choices_to=None, lookup_overrides=None, raw_id_admin=False):