multi-auth: Merged to [3151]archive/attic/multi-authattic/multi-auth

git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@3152 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 9 insertions, 2 deletions

diff --git a/django/db/models/manager.py b/django/db/models/manager.py
index 93de4a6adc..f679c5492c 100644
--- a/django/db/models/manager.py
+++ b/django/db/models/manager.py
@@ -3,6 +3,7 @@ from django.db import backend, connection
 from django.db.models.query import QuerySet
 from django.dispatch import dispatcher
 from django.db.models import signals
+from django.db.models.fields import FieldDoesNotExist
 from django.utils.datastructures import SortedDict
 
 # Size of each "chunk" for get_iterator calls.
@@ -13,8 +14,11 @@ def ensure_default_manager(sender):
     cls = sender
     if not hasattr(cls, '_default_manager'):
         # Create the default manager, if needed.
-        if hasattr(cls, 'objects'):
-            raise ValueError, "Model %s must specify a custom Manager, because it has a field named 'objects'" % name
+        try:
+            cls._meta.get_field('objects')
+            raise ValueError, "Model %s must specify a custom Manager, because it has a field named 'objects'" % cls.__name__
+        except FieldDoesNotExist:
+            pass
         cls.add_to_class('objects', Manager())
 
 dispatcher.connect(ensure_default_manager, signal=signals.class_prepared)
@@ -65,6 +69,9 @@ class Manager(object):
     def get(self, *args, **kwargs):
         return self.get_query_set().get(*args, **kwargs)
 
+    def get_or_create(self, *args, **kwargs):
+        return self.get_query_set().get_or_create(*args, **kwargs)
+
     def filter(self, *args, **kwargs):
         return self.get_query_set().filter(*args, **kwargs)