mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-11 22:49:13 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Renamed Manager.klass to Manager.model

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-30 23:40:54 +00:00
parent a917054961
commit 836478fa74
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,10 +121,10 @@ class ManyRelatedObjectsDescriptor(object):
# Prepare the manager. # Prepare the manager.
# TODO: Fix this hack? # TODO: Fix this hack?
# We're setting self.manager.klass here because # We're setting self.manager.model here because
# self.manager._prepare() expects that self.manager.klass is # self.manager._prepare() expects that self.manager.model is
# set. This is slightly hackish. # set. This is slightly hackish.
manager.klass = self.related.model manager.model = self.related.model
manager._prepare() manager._prepare()
return manager return manager

20
django/db/models/manager.py
View File

@ -34,28 +34,28 @@ class Manager(QuerySet):
# Increase the creation counter, and save our local copy. # Increase the creation counter, and save our local copy.
self.creation_counter = Manager.creation_counter self.creation_counter = Manager.creation_counter
Manager.creation_counter += 1 Manager.creation_counter += 1
self.klass = None self.model = None
def _prepare(self): def _prepare(self):
if self.klass._meta.get_latest_by: if self.model._meta.get_latest_by:
self.get_latest = self.__get_latest self.get_latest = self.__get_latest
def contribute_to_class(self, klass, name): def contribute_to_class(self, model, name):
# TODO: Use weakref because of possible memory leak / circular reference. # TODO: Use weakref because of possible memory leak / circular reference.
self.klass = klass self.model = model
dispatcher.connect(self._prepare, signal=signals.class_prepared, sender=klass) dispatcher.connect(self._prepare, signal=signals.class_prepared, sender=model)
setattr(klass, name, ManagerDescriptor(self)) setattr(model, name, ManagerDescriptor(self))
if not hasattr(klass, '_default_manager') or self.creation_counter < klass._default_manager.creation_counter: if not hasattr(model, '_default_manager') or self.creation_counter < model._default_manager.creation_counter:
klass._default_manager = self model._default_manager = self
def __get_latest(self, *args, **kwargs): def __get_latest(self, *args, **kwargs):
kwargs['order_by'] = ('-' + self.klass._meta.get_latest_by,) kwargs['order_by'] = ('-' + self.model._meta.get_latest_by,)
kwargs['limit'] = 1 kwargs['limit'] = 1
return self.get_object(*args, **kwargs) return self.get_object(*args, **kwargs)
def add(self, **kwargs): def add(self, **kwargs):
kwargs.update(self.core_values) kwargs.update(self.core_values)
new_obj = self.klass(**kwargs) new_obj = self.model(**kwargs)
new_obj.save() new_obj.save()
return new_obj return new_obj
add.alters_data = True add.alters_data = True