diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py index 2279f71639..590c866def 100644 --- a/django/db/models/__init__.py +++ b/django/db/models/__init__.py @@ -113,8 +113,6 @@ def get_installed_model_modules(core_models=None): pass # Skip model modules that don't actually have models in them. else: _installed_modules_cache.append(mod) - - return _installed_modules_cache class LazyDate: @@ -169,7 +167,6 @@ class RelatedObject(object): self.name = self.opts.module_name self.var_name = self.opts.object_name.lower() - def flatten_data(self, follow, obj=None): new_data = {} rel_instances = self.get_list(obj) @@ -739,7 +736,6 @@ class Manager(object): # objects -- MySQL returns the values as strings, instead. return [typecast_timestamp(str(row[0])) for row in cursor.fetchall()] - class ModelBase(type): "Metaclass for all models" def __new__(cls, name, bases, attrs): @@ -841,7 +837,6 @@ class ModelBase(type): new_class._prepare() - for field in fields: if field.rel: other = field.rel.to @@ -850,7 +845,7 @@ class ModelBase(type): else: related = RelatedObject(other._meta, new_class, field) field.contribute_to_related_class(other, related) - + return new_class class Model(object): @@ -947,7 +942,6 @@ class Model(object): cls.get_next_in_order = curry(cls.__get_next_or_previous_in_order, is_next=True) cls.get_previous_in_order = curry(cls.__get_next_or_previous_in_order, is_next=False) - _prepare = classmethod(_prepare) def save(self): @@ -1010,7 +1004,6 @@ class Model(object): if hasattr(self, '_pre_delete'): self._pre_delete() - msgs = [] cursor = connection.cursor() for related in self._meta.get_all_related_objects(): rel_opts_name = related.get_method_name_part() @@ -1038,7 +1031,6 @@ class Model(object): (backend.quote_name(self._meta.db_table), backend.quote_name(self._meta.pk.column)), [getattr(self, self._meta.pk.attname)]) - connection.commit() setattr(self, self._meta.pk.attname, None) for f in self._meta.fields: @@ -1243,7 +1235,7 @@ class Model(object): def _get_related_many_to_many(self, method_name, rel_class, rel_field, **kwargs): kwargs['%s__%s__exact' % (rel_field.name, self._meta.pk.name)] = getattr(self, self._meta.pk.attname) return getattr(rel_class._default_manager, method_name)(**kwargs) - + # Handles setting many-to-many related objects. # Example: Album.set_songs() def _set_related_many_to_many(self, rel_class, rel_field, id_list):