p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

4
django/db/models/__init__.py
View File

@ -26,14 +26,14 @@ def get_models_helper(mod, seen_models):
seen_models.extend(mod._MODELS)
if hasattr(mod, '__all__'):
for name in mod.__all__:
sub_mod = __import__("%s.%s" % (mod.__name__, name), '','',[''])
sub_mod = __import__("%s.%s" % (mod.__name__, name), '', '', [''])
get_models_helper(sub_mod, seen_models)
def get_app(app_label):
for app_name in settings.INSTALLED_APPS:
comps = app_name.split('.')
if app_label == comps[-1]:
app_models = __import__('%s.models' % app_name , '','',[''])
app_models = __import__('%s.models' % app_name, '', '', [''])
return app_models
raise ImproperlyConfigured, "App with label %s could not be found" % app_label

6
django/db/models/fields/__init__.py
View File

@ -387,7 +387,7 @@ class DateField(Field):
return datetime.datetime.now()
return value
def contribute_to_class(self,cls, name ):
def contribute_to_class(self, cls, name):
super(DateField,self).contribute_to_class(cls, name)
if not self.null:
setattr(cls, 'get_next_by_%s' % self.name,
@ -711,7 +711,7 @@ class OrderingField(IntegerField):
return "IntegerField"
def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=False, follow=True):
return [forms.HiddenField(name_prefix + self.name) ]
return [forms.HiddenField(name_prefix + self.name)]
class BoundFieldLine(object):
def __init__(self, field_line, field_mapping, original, bound_field_class=BoundField):
@ -761,7 +761,7 @@ class FieldSet(object):
self.classes = classes
def __repr__(self):
return "FieldSet:(%s,%s)" % (self.name, self.field_lines)
return "FieldSet: (%s, %s)" % (self.name, self.field_lines)
def bind(self, field_mapping, original, bound_field_set_class=BoundFieldSet):
return bound_field_set_class(self, field_mapping, original)

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

@ -23,7 +23,7 @@ def add_lookup(rel_cls, field):
def do_pending_lookups(sender):
other_cls = sender
key = (other_cls.__module__, other_cls.__name__)
for rel_cls, field in pending_lookups.setdefault(key,[]):
for rel_cls, field in pending_lookups.setdefault(key, []):
field.rel.to = other_cls
field.do_related_class(other_cls, rel_cls)
@ -100,17 +100,14 @@ class ForeignKey(SharedMethods, Field):
raw_id_admin=kwargs.pop('raw_id_admin', False))
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'):
if name in kwargs:
self.deprecated_args.append(name)
if not self.db_index:
self.db_index = True
def prepare_field_objs_and_params(self, manipulator, name_prefix):
params = {'validator_list': self.validator_list[:]}
params['member_name'] = name_prefix + self.attname
params = {'validator_list': self.validator_list[:], 'member_name': name_prefix + self.attname}
if self.rel.raw_id_admin:
field_objs = self.get_manipulator_field_objs()
params['validator_list'].append(curry(manipulator_valid_rel_key, self, manipulator))
@ -124,7 +121,7 @@ class ForeignKey(SharedMethods, Field):
else:
field_objs = [forms.SelectField]
params['choices'] = self.get_choices_default()
return (field_objs, params)
return field_objs, params
def get_manipulator_field_objs(self):
rel_field = self.rel.get_related_field()
@ -192,13 +189,12 @@ class OneToOneField(SharedMethods, IntegerField):
kwargs['primary_key'] = True
IntegerField.__init__(self, **kwargs)
self.db_index = True
for name in ('num_in_admin'):
if name in kwargs:
self.deprecated_args.append(name)
if not self.db_index:
self.db_index = True
def contribute_to_related_class(self, cls, related):
rel_obj_name = related.get_method_name_part()
# Add "get_thingie" methods for one-to-one related objects.
@ -224,13 +220,11 @@ class ManyToManyField(RelatedField, Field):
if name in kwargs:
self.deprecated_args.append(name)
if self.rel.raw_id_admin:
msg = gettext_lazy(' Separate multiple IDs with commas.')
msg = gettext_lazy('Separate multiple IDs with commas.')
else:
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 )
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)
def get_manipulator_field_objs(self):
if self.rel.raw_id_admin:
@ -293,7 +287,7 @@ class ManyToManyField(RelatedField, Field):
def contribute_to_related_class(self, cls, related):
rel_obj_name = related.get_method_name_part()
setattr(cls, 'get_%s' % rel_obj_name, curry(cls._get_related_many_to_many, method_name='get_object', rel_class=related.model , rel_field=related.field))
setattr(cls, 'get_%s' % rel_obj_name, curry(cls._get_related_many_to_many, method_name='get_object', rel_class=related.model, rel_field=related.field))
setattr(cls, 'get_%s_count' % rel_obj_name, curry(cls._get_related_many_to_many, method_name='get_count', rel_class=related.model, rel_field=related.field))
setattr(cls, 'get_%s_list' % rel_obj_name, curry(cls._get_related_many_to_many, method_name='get_list', rel_class=related.model, rel_field=related.field))
if related.opts.app_label == cls._meta.app_label:
@ -306,50 +300,13 @@ class ManyToManyField(RelatedField, Field):
def set_attributes_from_rel(self):
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:
def __init__(self, to, field_name, edit_inline=False,
related_name=None, limit_choices_to=None, lookup_overrides=None, raw_id_admin=False):
try:
to._meta
except AttributeError:
assert isinstance(to, basestring) , "'to' must be either a model, a model name or the string %r" % RECURSIVE_RELATIONSHIP_CONSTANT
assert isinstance(to, basestring), "'to' must be either a model, a model name or the string %r" % RECURSIVE_RELATIONSHIP_CONSTANT
self.to, self.field_name = to, field_name
self.edit_inline = edit_inline
self.related_name = related_name

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

@ -243,7 +243,7 @@ class AutomaticManipulator(Manipulator, Naming):
# self.fields_changed.append(f.verbose_name)
#
# # Save inline edited objects
# self._fill_related_objects(expanded_data,SaveHelper)
# self._fill_related_objects(expanded_data, SaveHelper)
#
# return new_object
#
@ -436,7 +436,7 @@ class ManipulatorCollection(list, Naming):
self.append(None)
prefix = '%s%s.' % (self.name_prefix, index )
child_manip = man_class(self.follow, self.name_parts + ( str(index), ) )
child_manip = man_class(self.follow, self.name_parts + (str(index),))
self[index] = child_manip
return child_manip