2012-06-08 00:08:47 +08:00
|
|
|
from __future__ import unicode_literals
|
|
|
|
|
2011-03-28 10:11:19 +08:00
|
|
|
import copy
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
import sys
|
2011-03-28 10:11:19 +08:00
|
|
|
from functools import update_wrapper
|
2012-07-20 22:16:57 +08:00
|
|
|
from django.utils.six.moves import zip
|
2011-01-26 11:42:31 +08:00
|
|
|
|
2013-10-18 19:25:30 +08:00
|
|
|
import django.db.models.manager # NOQA: Imported to register signal handler.
|
2011-07-13 17:35:51 +08:00
|
|
|
from django.conf import settings
|
|
|
|
from django.core.exceptions import (ObjectDoesNotExist,
|
|
|
|
MultipleObjectsReturned, FieldError, ValidationError, NON_FIELD_ERRORS)
|
2008-12-09 14:49:40 +08:00
|
|
|
from django.db.models.fields import AutoField, FieldDoesNotExist
|
2013-03-25 00:40:40 +08:00
|
|
|
from django.db.models.fields.related import (ForeignObjectRel, ManyToOneRel,
|
2010-10-09 07:54:43 +08:00
|
|
|
OneToOneField, add_lazy_relation)
|
2012-05-12 15:24:20 +08:00
|
|
|
from django.db import (router, transaction, DatabaseError,
|
2011-07-13 17:35:51 +08:00
|
|
|
DEFAULT_DB_ALIAS)
|
2010-11-10 00:46:42 +08:00
|
|
|
from django.db.models.query import Q
|
2012-07-08 00:39:09 +08:00
|
|
|
from django.db.models.query_utils import DeferredAttribute, deferred_class_factory
|
2010-11-10 00:46:42 +08:00
|
|
|
from django.db.models.deletion import Collector
|
2008-07-19 07:54:34 +08:00
|
|
|
from django.db.models.options import Options
|
2006-05-02 09:31:56 +08:00
|
|
|
from django.db.models import signals
|
2013-10-18 19:25:30 +08:00
|
|
|
from django.db.models.loading import get_model, MODELS_MODULE_NAME
|
2010-01-05 11:56:19 +08:00
|
|
|
from django.utils.translation import ugettext_lazy as _
|
2012-03-13 11:48:20 +08:00
|
|
|
from django.utils.functional import curry
|
2012-08-30 04:40:51 +08:00
|
|
|
from django.utils.encoding import force_str, force_text
|
2012-07-21 03:20:42 +08:00
|
|
|
from django.utils import six
|
2010-01-05 11:56:19 +08:00
|
|
|
from django.utils.text import get_text_list, capfirst
|
2011-07-13 17:35:51 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-07-21 16:01:46 +08:00
|
|
|
def subclass_exception(name, parents, module, attached_to=None):
|
|
|
|
"""
|
|
|
|
Create exception subclass. Used by ModelBase below.
|
|
|
|
|
|
|
|
If 'attached_to' is supplied, the exception will be created in a way that
|
|
|
|
allows it to be pickled, assuming the returned exception class will be added
|
|
|
|
as an attribute to the 'attached_to' class.
|
|
|
|
"""
|
|
|
|
class_dict = {'__module__': module}
|
|
|
|
if attached_to is not None:
|
|
|
|
def __reduce__(self):
|
|
|
|
# Exceptions are special - they've got state that isn't
|
|
|
|
# in self.__dict__. We assume it is all in self.args.
|
|
|
|
return (unpickle_inner_exception, (attached_to, name), self.args)
|
|
|
|
|
|
|
|
def __setstate__(self, args):
|
|
|
|
self.args = args
|
|
|
|
|
|
|
|
class_dict['__reduce__'] = __reduce__
|
|
|
|
class_dict['__setstate__'] = __setstate__
|
|
|
|
|
|
|
|
return type(name, parents, class_dict)
|
|
|
|
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
class ModelBase(type):
|
2008-07-09 05:53:38 +08:00
|
|
|
"""
|
|
|
|
Metaclass for all models.
|
|
|
|
"""
|
2006-05-02 09:31:56 +08:00
|
|
|
def __new__(cls, name, bases, attrs):
|
2008-07-06 19:55:30 +08:00
|
|
|
super_new = super(ModelBase, cls).__new__
|
2013-01-29 13:28:09 +08:00
|
|
|
|
2012-07-23 19:48:04 +08:00
|
|
|
# six.with_metaclass() inserts an extra class called 'NewBase' in the
|
2013-01-29 13:28:09 +08:00
|
|
|
# inheritance tree: Model -> NewBase -> object. But the initialization
|
|
|
|
# should be executed only once for a given model class.
|
|
|
|
|
|
|
|
# attrs will never be empty for classes declared in the standard way
|
|
|
|
# (ie. with the `class` keyword). This is quite robust.
|
|
|
|
if name == 'NewBase' and attrs == {}:
|
|
|
|
return super_new(cls, name, bases, attrs)
|
|
|
|
|
|
|
|
# Also ensure initialization is only performed for subclasses of Model
|
|
|
|
# (excluding Model class itself).
|
2012-07-23 19:48:04 +08:00
|
|
|
parents = [b for b in bases if isinstance(b, ModelBase) and
|
|
|
|
not (b.__name__ == 'NewBase' and b.__mro__ == (b, object))]
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if not parents:
|
2008-07-06 19:55:30 +08:00
|
|
|
return super_new(cls, name, bases, attrs)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
|
|
|
# Create the class.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
module = attrs.pop('__module__')
|
2008-07-06 19:55:30 +08:00
|
|
|
new_class = super_new(cls, name, bases, {'__module__': module})
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
attr_meta = attrs.pop('Meta', None)
|
|
|
|
abstract = getattr(attr_meta, 'abstract', False)
|
|
|
|
if not attr_meta:
|
|
|
|
meta = getattr(new_class, 'Meta', None)
|
|
|
|
else:
|
|
|
|
meta = attr_meta
|
|
|
|
base_meta = getattr(new_class, '_meta', None)
|
|
|
|
|
2008-06-29 10:35:08 +08:00
|
|
|
if getattr(meta, 'app_label', None) is None:
|
2013-07-17 01:21:17 +08:00
|
|
|
# Figure out the app_label by looking one level up from the package
|
|
|
|
# or module named 'models'. If no such package or module exists,
|
|
|
|
# fall back to looking one level up from the module this model is
|
|
|
|
# defined in.
|
|
|
|
|
2008-06-29 10:35:08 +08:00
|
|
|
# For 'django.contrib.sites.models', this would be 'sites'.
|
2013-07-17 01:21:17 +08:00
|
|
|
# For 'geo.models.places' this would be 'geo'.
|
|
|
|
|
2008-06-29 10:35:08 +08:00
|
|
|
model_module = sys.modules[new_class.__module__]
|
2013-07-17 01:21:17 +08:00
|
|
|
package_components = model_module.__name__.split('.')
|
|
|
|
package_components.reverse() # find the last occurrence of 'models'
|
|
|
|
try:
|
|
|
|
app_label_index = package_components.index(MODELS_MODULE_NAME) + 1
|
|
|
|
except ValueError:
|
|
|
|
app_label_index = 1
|
|
|
|
kwargs = {"app_label": package_components[app_label_index]}
|
2008-06-29 10:35:08 +08:00
|
|
|
else:
|
|
|
|
kwargs = {}
|
|
|
|
|
|
|
|
new_class.add_to_class('_meta', Options(meta, **kwargs))
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if not abstract:
|
2013-10-20 07:33:10 +08:00
|
|
|
new_class.add_to_class(
|
|
|
|
'DoesNotExist',
|
|
|
|
subclass_exception(
|
|
|
|
str('DoesNotExist'),
|
|
|
|
tuple(x.DoesNotExist for x in parents if hasattr(x, '_meta') and not x._meta.abstract) or (ObjectDoesNotExist,),
|
|
|
|
module,
|
|
|
|
attached_to=new_class))
|
|
|
|
new_class.add_to_class(
|
|
|
|
'MultipleObjectsReturned',
|
|
|
|
subclass_exception(
|
|
|
|
str('MultipleObjectsReturned'),
|
|
|
|
tuple(x.MultipleObjectsReturned for x in parents if hasattr(x, '_meta') and not x._meta.abstract) or (MultipleObjectsReturned,),
|
|
|
|
module,
|
|
|
|
attached_to=new_class))
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if base_meta and not base_meta.abstract:
|
|
|
|
# Non-abstract child classes inherit some attributes from their
|
|
|
|
# non-abstract parent (unless an ABC comes before it in the
|
|
|
|
# method resolution order).
|
|
|
|
if not hasattr(meta, 'ordering'):
|
|
|
|
new_class._meta.ordering = base_meta.ordering
|
|
|
|
if not hasattr(meta, 'get_latest_by'):
|
|
|
|
new_class._meta.get_latest_by = base_meta.get_latest_by
|
|
|
|
|
2009-03-18 17:47:08 +08:00
|
|
|
is_proxy = new_class._meta.proxy
|
|
|
|
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
# If the model is a proxy, ensure that the base class
|
|
|
|
# hasn't been swapped out.
|
|
|
|
if is_proxy and base_meta and base_meta.swapped:
|
|
|
|
raise TypeError("%s cannot proxy the swapped model '%s'." % (name, base_meta.swapped))
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if getattr(new_class, '_default_manager', None):
|
2009-03-18 17:47:08 +08:00
|
|
|
if not is_proxy:
|
|
|
|
# Multi-table inheritance doesn't inherit default manager from
|
|
|
|
# parents.
|
|
|
|
new_class._default_manager = None
|
|
|
|
new_class._base_manager = None
|
|
|
|
else:
|
|
|
|
# Proxy classes do inherit parent's default manager, if none is
|
|
|
|
# set explicitly.
|
|
|
|
new_class._default_manager = new_class._default_manager._copy_to_model(new_class)
|
|
|
|
new_class._base_manager = new_class._base_manager._copy_to_model(new_class)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2006-07-06 21:25:12 +08:00
|
|
|
# Bail out early if we have already created this class.
|
2013-05-09 22:16:43 +08:00
|
|
|
m = new_class._meta.app_cache.get_model(new_class._meta.app_label, name,
|
2011-04-21 01:58:37 +08:00
|
|
|
seed_cache=False, only_installed=False)
|
2006-07-06 21:25:12 +08:00
|
|
|
if m is not None:
|
|
|
|
return m
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
# Add all attributes to the class.
|
|
|
|
for obj_name, obj in attrs.items():
|
|
|
|
new_class.add_to_class(obj_name, obj)
|
|
|
|
|
2009-03-18 17:47:08 +08:00
|
|
|
# All the fields of any type declared on this model
|
|
|
|
new_fields = new_class._meta.local_fields + \
|
|
|
|
new_class._meta.local_many_to_many + \
|
|
|
|
new_class._meta.virtual_fields
|
2013-08-30 07:20:00 +08:00
|
|
|
field_names = set(f.name for f in new_fields)
|
2009-03-18 17:47:08 +08:00
|
|
|
|
|
|
|
# Basic setup for proxy models.
|
|
|
|
if is_proxy:
|
|
|
|
base = None
|
2013-10-11 19:25:14 +08:00
|
|
|
for parent in [kls for kls in parents if hasattr(kls, '_meta')]:
|
2009-03-18 17:47:08 +08:00
|
|
|
if parent._meta.abstract:
|
|
|
|
if parent._meta.fields:
|
|
|
|
raise TypeError("Abstract base class containing model fields not permitted for proxy model '%s'." % name)
|
|
|
|
else:
|
|
|
|
continue
|
|
|
|
if base is not None:
|
|
|
|
raise TypeError("Proxy model '%s' has more than one non-abstract model base class." % name)
|
|
|
|
else:
|
|
|
|
base = parent
|
|
|
|
if base is None:
|
2013-04-05 06:16:16 +08:00
|
|
|
raise TypeError("Proxy model '%s' has no non-abstract model base class." % name)
|
2009-03-18 17:47:08 +08:00
|
|
|
if (new_class._meta.local_fields or
|
|
|
|
new_class._meta.local_many_to_many):
|
2010-01-11 02:36:20 +08:00
|
|
|
raise FieldError("Proxy model '%s' contains model fields." % name)
|
2009-03-18 17:47:08 +08:00
|
|
|
new_class._meta.setup_proxy(base)
|
2012-02-22 13:26:50 +08:00
|
|
|
new_class._meta.concrete_model = base._meta.concrete_model
|
|
|
|
else:
|
|
|
|
new_class._meta.concrete_model = new_class
|
2009-03-18 17:47:08 +08:00
|
|
|
|
2013-08-12 19:30:38 +08:00
|
|
|
# Collect the parent links for multi-table inheritance.
|
|
|
|
parent_links = {}
|
|
|
|
for base in reversed([new_class] + parents):
|
|
|
|
# Conceptually equivalent to `if base is Model`.
|
|
|
|
if not hasattr(base, '_meta'):
|
|
|
|
continue
|
|
|
|
# Skip concrete parent classes.
|
|
|
|
if base != new_class and not base._meta.abstract:
|
|
|
|
continue
|
|
|
|
# Locate OneToOneField instances.
|
|
|
|
for field in base._meta.local_fields:
|
|
|
|
if isinstance(field, OneToOneField):
|
|
|
|
parent_links[field.rel.to] = field
|
2009-03-18 17:47:08 +08:00
|
|
|
|
2013-08-12 19:30:38 +08:00
|
|
|
# Do the appropriate setup for any model parents.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
for base in parents:
|
2009-05-11 18:10:03 +08:00
|
|
|
original_base = base
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if not hasattr(base, '_meta'):
|
|
|
|
# Things without _meta aren't functional models, so they're
|
|
|
|
# uninteresting parents.
|
|
|
|
continue
|
2008-09-03 13:53:50 +08:00
|
|
|
|
2009-03-04 18:39:29 +08:00
|
|
|
parent_fields = base._meta.local_fields + base._meta.local_many_to_many
|
|
|
|
# Check for clashes between locally declared fields and those
|
|
|
|
# on the base classes (we cannot handle shadowed fields at the
|
|
|
|
# moment).
|
|
|
|
for field in parent_fields:
|
|
|
|
if field.name in field_names:
|
|
|
|
raise FieldError('Local field %r in class %r clashes '
|
|
|
|
'with field of similar name from '
|
|
|
|
'base class %r' %
|
|
|
|
(field.name, name, base.__name__))
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if not base._meta.abstract:
|
2008-09-04 02:38:43 +08:00
|
|
|
# Concrete classes...
|
2012-02-22 13:26:50 +08:00
|
|
|
base = base._meta.concrete_model
|
2013-08-12 19:30:38 +08:00
|
|
|
if base in parent_links:
|
|
|
|
field = parent_links[base]
|
2009-03-18 17:47:08 +08:00
|
|
|
elif not is_proxy:
|
2013-02-05 17:16:07 +08:00
|
|
|
attr_name = '%s_ptr' % base._meta.model_name
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
field = OneToOneField(base, name=attr_name,
|
|
|
|
auto_created=True, parent_link=True)
|
|
|
|
new_class.add_to_class(attr_name, field)
|
2009-03-18 17:47:08 +08:00
|
|
|
else:
|
|
|
|
field = None
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
new_class._meta.parents[base] = field
|
|
|
|
else:
|
2008-09-04 02:38:43 +08:00
|
|
|
# .. and abstract ones.
|
2008-09-02 23:26:00 +08:00
|
|
|
for field in parent_fields:
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
new_class.add_to_class(field.name, copy.deepcopy(field))
|
|
|
|
|
2008-09-04 02:38:43 +08:00
|
|
|
# Pass any non-abstract parent classes onto child.
|
|
|
|
new_class._meta.parents.update(base._meta.parents)
|
|
|
|
|
2008-09-02 17:04:54 +08:00
|
|
|
# Inherit managers from the abstract base classes.
|
2009-03-18 17:47:08 +08:00
|
|
|
new_class.copy_managers(base._meta.abstract_managers)
|
|
|
|
|
|
|
|
# Proxy models inherit the non-abstract managers from their base,
|
|
|
|
# unless they have redefined any of them.
|
|
|
|
if is_proxy:
|
2009-05-11 18:10:03 +08:00
|
|
|
new_class.copy_managers(original_base._meta.concrete_managers)
|
2008-09-03 13:53:50 +08:00
|
|
|
|
2009-03-04 18:39:29 +08:00
|
|
|
# Inherit virtual fields (like GenericForeignKey) from the parent
|
|
|
|
# class
|
2008-09-02 23:26:00 +08:00
|
|
|
for field in base._meta.virtual_fields:
|
|
|
|
if base._meta.abstract and field.name in field_names:
|
2013-07-08 08:39:54 +08:00
|
|
|
raise FieldError('Local field %r in class %r clashes '
|
|
|
|
'with field of similar name from '
|
|
|
|
'abstract base class %r' %
|
2008-09-02 23:26:00 +08:00
|
|
|
(field.name, name, base.__name__))
|
|
|
|
new_class.add_to_class(field.name, copy.deepcopy(field))
|
2008-09-03 13:53:50 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if abstract:
|
|
|
|
# Abstract base models can't be instantiated and don't appear in
|
|
|
|
# the list of models for an app. We do the final setup for them a
|
|
|
|
# little differently from normal models.
|
|
|
|
attr_meta.abstract = False
|
|
|
|
new_class.Meta = attr_meta
|
|
|
|
return new_class
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
new_class._prepare()
|
2013-09-02 18:06:32 +08:00
|
|
|
|
2013-05-09 22:16:43 +08:00
|
|
|
new_class._meta.app_cache.register_models(new_class._meta.app_label, new_class)
|
|
|
|
# Because of the way imports happen (recursively), we may or may not be
|
|
|
|
# the first time this model tries to register with the framework. There
|
|
|
|
# should only be one class for each model, so we always return the
|
|
|
|
# registered version.
|
|
|
|
return new_class._meta.app_cache.get_model(new_class._meta.app_label, name,
|
|
|
|
seed_cache=False, only_installed=False)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2009-03-18 17:47:08 +08:00
|
|
|
def copy_managers(cls, base_managers):
|
|
|
|
# This is in-place sorting of an Options attribute, but that's fine.
|
|
|
|
base_managers.sort()
|
2013-11-03 05:02:56 +08:00
|
|
|
for _, mgr_name, manager in base_managers: # NOQA (redefinition of _)
|
2009-03-18 17:47:08 +08:00
|
|
|
val = getattr(cls, mgr_name, None)
|
|
|
|
if not val or val is manager:
|
|
|
|
new_manager = manager._copy_to_model(cls)
|
|
|
|
cls.add_to_class(mgr_name, new_manager)
|
|
|
|
|
2008-02-08 20:01:23 +08:00
|
|
|
def add_to_class(cls, name, value):
|
|
|
|
if hasattr(value, 'contribute_to_class'):
|
|
|
|
value.contribute_to_class(cls, name)
|
|
|
|
else:
|
|
|
|
setattr(cls, name, value)
|
|
|
|
|
|
|
|
def _prepare(cls):
|
2008-07-09 05:53:38 +08:00
|
|
|
"""
|
|
|
|
Creates some methods once self._meta has been populated.
|
|
|
|
"""
|
2008-02-08 20:01:23 +08:00
|
|
|
opts = cls._meta
|
|
|
|
opts._prepare(cls)
|
|
|
|
|
|
|
|
if opts.order_with_respect_to:
|
|
|
|
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)
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
|
2010-10-09 07:54:43 +08:00
|
|
|
# defer creating accessors on the foreign class until we are
|
|
|
|
# certain it has been created
|
|
|
|
def make_foreign_order_accessors(field, model, cls):
|
|
|
|
setattr(
|
|
|
|
field.rel.to,
|
|
|
|
'get_%s_order' % cls.__name__.lower(),
|
|
|
|
curry(method_get_order, cls)
|
|
|
|
)
|
|
|
|
setattr(
|
|
|
|
field.rel.to,
|
|
|
|
'set_%s_order' % cls.__name__.lower(),
|
|
|
|
curry(method_set_order, cls)
|
|
|
|
)
|
|
|
|
add_lazy_relation(
|
|
|
|
cls,
|
|
|
|
opts.order_with_respect_to,
|
|
|
|
opts.order_with_respect_to.rel.to,
|
|
|
|
make_foreign_order_accessors
|
|
|
|
)
|
2008-02-08 20:01:23 +08:00
|
|
|
|
|
|
|
# Give the class a docstring -- its definition.
|
|
|
|
if cls.__doc__ is None:
|
2013-08-30 07:20:00 +08:00
|
|
|
cls.__doc__ = "%s(%s)" % (cls.__name__, ", ".join(f.attname for f in opts.fields))
|
2008-02-08 20:01:23 +08:00
|
|
|
|
|
|
|
if hasattr(cls, 'get_absolute_url'):
|
2010-03-12 22:36:39 +08:00
|
|
|
cls.get_absolute_url = update_wrapper(curry(get_absolute_url, opts, cls.get_absolute_url),
|
|
|
|
cls.get_absolute_url)
|
2008-02-08 20:01:23 +08:00
|
|
|
|
2008-08-06 23:32:46 +08:00
|
|
|
signals.class_prepared.send(sender=cls)
|
2008-02-08 20:01:23 +08:00
|
|
|
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
class ModelState(object):
|
|
|
|
"""
|
|
|
|
A class for storing instance state
|
|
|
|
"""
|
|
|
|
def __init__(self, db=None):
|
|
|
|
self.db = db
|
2010-11-19 06:43:46 +08:00
|
|
|
# If true, uniqueness validation checks will consider this a new, as-yet-unsaved object.
|
|
|
|
# Necessary for correct validation of new instances of objects with explicit (non-auto) PKs.
|
|
|
|
# This impacts validation only; it has no effect on the actual save.
|
2010-11-19 07:29:58 +08:00
|
|
|
self.adding = True
|
2009-12-22 23:18:51 +08:00
|
|
|
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
|
2013-01-08 12:41:59 +08:00
|
|
|
class Model(six.with_metaclass(ModelBase)):
|
2009-03-19 17:06:04 +08:00
|
|
|
_deferred = False
|
2006-05-02 09:31:56 +08:00
|
|
|
|
|
|
|
def __init__(self, *args, **kwargs):
|
2008-08-06 23:32:46 +08:00
|
|
|
signals.pre_init.send(sender=self.__class__, args=args, kwargs=kwargs)
|
2007-06-23 22:16:00 +08:00
|
|
|
|
2010-04-30 22:27:29 +08:00
|
|
|
# Set up the storage for instance state
|
2009-12-22 23:18:51 +08:00
|
|
|
self._state = ModelState()
|
|
|
|
|
2007-02-26 14:21:24 +08:00
|
|
|
# There is a rather weird disparity here; if kwargs, it's set, then args
|
2007-06-23 22:16:00 +08:00
|
|
|
# overrides it. It should be one or the other; don't duplicate the work
|
2007-02-26 14:21:24 +08:00
|
|
|
# The reason for the kwargs check is that standard iterator passes in by
|
2008-02-14 07:28:58 +08:00
|
|
|
# args, and instantiation for iteration is 33% faster.
|
2007-02-26 14:16:19 +08:00
|
|
|
args_len = len(args)
|
2013-03-25 00:40:40 +08:00
|
|
|
if args_len > len(self._meta.concrete_fields):
|
2007-02-26 14:21:24 +08:00
|
|
|
# Daft, but matches old exception sans the err msg.
|
|
|
|
raise IndexError("Number of args exceeds number of fields")
|
2007-02-26 14:16:19 +08:00
|
|
|
|
|
|
|
if not kwargs:
|
2013-03-25 00:40:40 +08:00
|
|
|
fields_iter = iter(self._meta.concrete_fields)
|
2012-05-07 23:25:12 +08:00
|
|
|
# The ordering of the zip calls matter - zip throws StopIteration
|
2007-02-26 14:21:24 +08:00
|
|
|
# when an iter throws it. So if the first iter throws it, the second
|
|
|
|
# is *not* consumed. We rely on this, so don't change the order
|
|
|
|
# without changing the logic.
|
2012-05-07 23:25:12 +08:00
|
|
|
for val, field in zip(args, fields_iter):
|
2007-02-26 14:16:19 +08:00
|
|
|
setattr(self, field.attname, val)
|
|
|
|
else:
|
2007-02-26 14:21:24 +08:00
|
|
|
# Slower, kwargs-ready version.
|
2013-03-25 00:40:40 +08:00
|
|
|
fields_iter = iter(self._meta.fields)
|
2012-05-07 23:25:12 +08:00
|
|
|
for val, field in zip(args, fields_iter):
|
2007-02-26 14:16:19 +08:00
|
|
|
setattr(self, field.attname, val)
|
|
|
|
kwargs.pop(field.name, None)
|
2007-02-26 14:21:24 +08:00
|
|
|
# Maintain compatibility with existing calls.
|
2007-02-26 14:16:19 +08:00
|
|
|
if isinstance(field.rel, ManyToOneRel):
|
|
|
|
kwargs.pop(field.attname, None)
|
2007-06-23 22:16:00 +08:00
|
|
|
|
2007-02-26 14:21:24 +08:00
|
|
|
# Now we're left with the unprocessed fields that *must* come from
|
|
|
|
# keywords, or default.
|
2007-06-23 22:16:00 +08:00
|
|
|
|
2007-02-26 14:16:19 +08:00
|
|
|
for field in fields_iter:
|
2009-03-06 12:51:05 +08:00
|
|
|
is_related_object = False
|
2009-03-22 09:45:22 +08:00
|
|
|
# This slightly odd construct is so that we can access any
|
|
|
|
# data-descriptor object (DeferredAttribute) without triggering its
|
|
|
|
# __get__ method.
|
|
|
|
if (field.attname not in kwargs and
|
2013-03-25 00:40:40 +08:00
|
|
|
(isinstance(self.__class__.__dict__.get(field.attname), DeferredAttribute)
|
|
|
|
or field.column is None)):
|
2009-03-22 09:45:22 +08:00
|
|
|
# This field will be populated on request.
|
|
|
|
continue
|
2007-02-26 14:16:19 +08:00
|
|
|
if kwargs:
|
2013-03-25 00:40:40 +08:00
|
|
|
if isinstance(field.rel, ForeignObjectRel):
|
2006-05-02 09:31:56 +08:00
|
|
|
try:
|
2007-02-26 14:16:19 +08:00
|
|
|
# Assume object instance was passed in.
|
|
|
|
rel_obj = kwargs.pop(field.name)
|
2009-03-06 12:51:05 +08:00
|
|
|
is_related_object = True
|
2006-05-02 09:31:56 +08:00
|
|
|
except KeyError:
|
|
|
|
try:
|
2007-02-26 14:16:19 +08:00
|
|
|
# Object instance wasn't passed in -- must be an ID.
|
|
|
|
val = kwargs.pop(field.attname)
|
|
|
|
except KeyError:
|
|
|
|
val = field.get_default()
|
|
|
|
else:
|
2007-02-26 14:21:24 +08:00
|
|
|
# Object instance was passed in. Special case: You can
|
|
|
|
# pass in "None" for related objects if it's allowed.
|
2007-02-26 14:16:19 +08:00
|
|
|
if rel_obj is None and field.null:
|
|
|
|
val = None
|
|
|
|
else:
|
2009-10-29 22:32:01 +08:00
|
|
|
try:
|
|
|
|
val = kwargs.pop(field.attname)
|
|
|
|
except KeyError:
|
|
|
|
# This is done with an exception rather than the
|
|
|
|
# default argument on pop because we don't want
|
|
|
|
# get_default() to be evaluated, and then not used.
|
|
|
|
# Refs #12057.
|
|
|
|
val = field.get_default()
|
2006-05-02 09:31:56 +08:00
|
|
|
else:
|
2007-02-26 14:16:19 +08:00
|
|
|
val = field.get_default()
|
2013-03-25 00:40:40 +08:00
|
|
|
|
2009-03-06 12:51:05 +08:00
|
|
|
if is_related_object:
|
|
|
|
# If we are passed a related instance, set it using the
|
|
|
|
# field.name instead of field.attname (e.g. "user" instead of
|
|
|
|
# "user_id") so that the object gets properly cached (and type
|
|
|
|
# checked) by the RelatedObjectDescriptor.
|
2008-08-02 07:16:59 +08:00
|
|
|
setattr(self, field.name, rel_obj)
|
|
|
|
else:
|
|
|
|
setattr(self, field.attname, val)
|
2007-02-26 14:16:19 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
if kwargs:
|
2012-08-08 22:33:15 +08:00
|
|
|
for prop in list(kwargs):
|
2007-02-26 14:16:19 +08:00
|
|
|
try:
|
|
|
|
if isinstance(getattr(self.__class__, prop), property):
|
|
|
|
setattr(self, prop, kwargs.pop(prop))
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
|
|
|
if kwargs:
|
2012-08-08 22:33:15 +08:00
|
|
|
raise TypeError("'%s' is an invalid keyword argument for this function" % list(kwargs)[0])
|
2012-07-23 19:48:04 +08:00
|
|
|
super(Model, self).__init__()
|
2008-08-06 23:32:46 +08:00
|
|
|
signals.post_init.send(sender=self.__class__, instance=self)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def __repr__(self):
|
2008-11-17 02:58:43 +08:00
|
|
|
try:
|
2012-07-20 20:48:51 +08:00
|
|
|
u = six.text_type(self)
|
2008-11-17 02:58:43 +08:00
|
|
|
except (UnicodeEncodeError, UnicodeDecodeError):
|
|
|
|
u = '[Bad Unicode data]'
|
2012-08-30 04:40:51 +08:00
|
|
|
return force_str('<%s: %s>' % (self.__class__.__name__, u))
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
def __str__(self):
|
2013-09-02 18:06:32 +08:00
|
|
|
if six.PY2 and hasattr(self, '__unicode__'):
|
2012-07-21 16:00:10 +08:00
|
|
|
return force_text(self).encode('utf-8')
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
return '%s object' % self.__class__.__name__
|
|
|
|
|
|
|
|
def __eq__(self, other):
|
2013-08-14 16:05:01 +08:00
|
|
|
if not isinstance(other, Model):
|
|
|
|
return False
|
|
|
|
if self._meta.concrete_model != other._meta.concrete_model:
|
|
|
|
return False
|
|
|
|
my_pk = self._get_pk_val()
|
|
|
|
if my_pk is None:
|
|
|
|
return self is other
|
|
|
|
return my_pk == other._get_pk_val()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
def __ne__(self, other):
|
|
|
|
return not self.__eq__(other)
|
|
|
|
|
|
|
|
def __hash__(self):
|
2013-08-14 16:05:01 +08:00
|
|
|
if self._get_pk_val() is None:
|
|
|
|
raise TypeError("Model instances without primary key value are unhashable")
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
return hash(self._get_pk_val())
|
|
|
|
|
2009-03-19 17:06:04 +08:00
|
|
|
def __reduce__(self):
|
|
|
|
"""
|
2011-04-03 05:46:28 +08:00
|
|
|
Provides pickling support. Normally, this just dispatches to Python's
|
2009-03-19 17:06:04 +08:00
|
|
|
standard handling. However, for models with deferred field loading, we
|
|
|
|
need to do things manually, as they're dynamically created classes and
|
|
|
|
only module-level classes can be pickled by the default path.
|
|
|
|
"""
|
|
|
|
data = self.__dict__
|
2013-05-21 17:57:24 +08:00
|
|
|
if not self._deferred:
|
|
|
|
class_id = self._meta.app_label, self._meta.object_name
|
|
|
|
return model_unpickle, (class_id, [], simple_class_factory), data
|
2009-03-19 17:06:04 +08:00
|
|
|
defers = []
|
2012-07-08 00:39:09 +08:00
|
|
|
for field in self._meta.fields:
|
|
|
|
if isinstance(self.__class__.__dict__.get(field.attname),
|
2013-05-21 17:57:24 +08:00
|
|
|
DeferredAttribute):
|
2012-07-08 00:39:09 +08:00
|
|
|
defers.append(field.attname)
|
|
|
|
model = self._meta.proxy_for_model
|
2013-05-21 17:57:24 +08:00
|
|
|
class_id = model._meta.app_label, model._meta.object_name
|
|
|
|
return (model_unpickle, (class_id, defers, deferred_class_factory), data)
|
2009-03-19 17:06:04 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def _get_pk_val(self, meta=None):
|
|
|
|
if not meta:
|
|
|
|
meta = self._meta
|
|
|
|
return getattr(self, meta.pk.attname)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def _set_pk_val(self, value):
|
|
|
|
return setattr(self, self._meta.pk.attname, value)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
pk = property(_get_pk_val, _set_pk_val)
|
|
|
|
|
2008-12-08 16:15:37 +08:00
|
|
|
def serializable_value(self, field_name):
|
|
|
|
"""
|
2008-12-09 14:49:40 +08:00
|
|
|
Returns the value of the field name for this instance. If the field is
|
|
|
|
a foreign key, returns the id value, instead of the object. If there's
|
|
|
|
no Field object with this name on the model, the model attribute's
|
|
|
|
value is returned directly.
|
|
|
|
|
2008-12-08 16:15:37 +08:00
|
|
|
Used to serialize a field's value (in the serializer, or form output,
|
2008-12-09 14:49:40 +08:00
|
|
|
for example). Normally, you would just access the attribute directly
|
|
|
|
and not use this method.
|
2008-12-08 16:15:37 +08:00
|
|
|
"""
|
2008-12-09 14:49:40 +08:00
|
|
|
try:
|
|
|
|
field = self._meta.get_field_by_name(field_name)[0]
|
|
|
|
except FieldDoesNotExist:
|
|
|
|
return getattr(self, field_name)
|
2008-12-08 16:15:37 +08:00
|
|
|
return getattr(self, field.attname)
|
|
|
|
|
2012-05-12 15:24:20 +08:00
|
|
|
def save(self, force_insert=False, force_update=False, using=None,
|
|
|
|
update_fields=None):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2008-07-09 05:53:38 +08:00
|
|
|
Saves the current instance. Override this in a subclass if you want to
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
control the saving process.
|
2008-08-10 01:19:23 +08:00
|
|
|
|
|
|
|
The 'force_insert' and 'force_update' parameters can be used to insist
|
|
|
|
that the "save" must be an SQL insert or update (or equivalent for
|
|
|
|
non-SQL backends), respectively. Normally, they should not be set.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2012-08-13 03:17:54 +08:00
|
|
|
using = using or router.db_for_write(self.__class__, instance=self)
|
2012-05-12 15:24:20 +08:00
|
|
|
if force_insert and (force_update or update_fields):
|
2010-01-11 02:36:20 +08:00
|
|
|
raise ValueError("Cannot force both insert and updating in model saving.")
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-05-12 15:24:20 +08:00
|
|
|
if update_fields is not None:
|
|
|
|
# If update_fields is empty, skip the save. We do also check for
|
|
|
|
# no-op saves later on for inheritance cases. This bailout is
|
|
|
|
# still needed for skipping signal sending.
|
|
|
|
if len(update_fields) == 0:
|
|
|
|
return
|
|
|
|
|
|
|
|
update_fields = frozenset(update_fields)
|
2012-07-05 21:39:19 +08:00
|
|
|
field_names = set()
|
|
|
|
|
|
|
|
for field in self._meta.fields:
|
|
|
|
if not field.primary_key:
|
|
|
|
field_names.add(field.name)
|
|
|
|
|
|
|
|
if field.name != field.attname:
|
|
|
|
field_names.add(field.attname)
|
|
|
|
|
2012-05-12 15:24:20 +08:00
|
|
|
non_model_fields = update_fields.difference(field_names)
|
|
|
|
|
|
|
|
if non_model_fields:
|
|
|
|
raise ValueError("The following fields do not exist in this "
|
|
|
|
"model or are m2m fields: %s"
|
|
|
|
% ', '.join(non_model_fields))
|
|
|
|
|
2012-08-13 03:17:54 +08:00
|
|
|
# If saving to the same database, and this model is deferred, then
|
|
|
|
# automatically do a "update_fields" save on the loaded fields.
|
|
|
|
elif not force_insert and self._deferred and using == self._state.db:
|
|
|
|
field_names = set()
|
2013-03-25 00:40:40 +08:00
|
|
|
for field in self._meta.concrete_fields:
|
2012-08-13 03:17:54 +08:00
|
|
|
if not field.primary_key and not hasattr(field, 'through'):
|
|
|
|
field_names.add(field.attname)
|
|
|
|
deferred_fields = [
|
|
|
|
f.attname for f in self._meta.fields
|
2013-10-20 07:33:10 +08:00
|
|
|
if (f.attname not in self.__dict__ and
|
|
|
|
isinstance(self.__class__.__dict__[f.attname], DeferredAttribute))
|
|
|
|
]
|
2012-08-13 03:17:54 +08:00
|
|
|
|
|
|
|
loaded_fields = field_names.difference(deferred_fields)
|
|
|
|
if loaded_fields:
|
|
|
|
update_fields = frozenset(loaded_fields)
|
|
|
|
|
2012-05-12 15:24:20 +08:00
|
|
|
self.save_base(using=using, force_insert=force_insert,
|
|
|
|
force_update=force_update, update_fields=update_fields)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
save.alters_data = True
|
|
|
|
|
2012-11-29 18:10:31 +08:00
|
|
|
def save_base(self, raw=False, force_insert=False,
|
2012-05-12 15:24:20 +08:00
|
|
|
force_update=False, using=None, update_fields=None):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2012-11-29 18:10:31 +08:00
|
|
|
Handles the parts of saving which should be done only once per save,
|
|
|
|
yet need to be done in raw saves, too. This includes some sanity
|
|
|
|
checks and signal sending.
|
|
|
|
|
|
|
|
The 'raw' argument is telling save_base not to save any parent
|
|
|
|
models and not to do any changes to the values before save. This
|
|
|
|
is used by fixture loading.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2010-01-22 22:30:06 +08:00
|
|
|
using = using or router.db_for_write(self.__class__, instance=self)
|
2012-05-12 15:24:20 +08:00
|
|
|
assert not (force_insert and (force_update or update_fields))
|
|
|
|
assert update_fields is None or len(update_fields) > 0
|
2012-11-29 18:10:31 +08:00
|
|
|
cls = origin = self.__class__
|
|
|
|
# Skip proxies, but keep the origin as the proxy model.
|
|
|
|
if cls._meta.proxy:
|
|
|
|
cls = cls._meta.concrete_model
|
|
|
|
meta = cls._meta
|
|
|
|
if not meta.auto_created:
|
2012-05-12 15:24:20 +08:00
|
|
|
signals.pre_save.send(sender=origin, instance=self, raw=raw, using=using,
|
|
|
|
update_fields=update_fields)
|
2012-11-29 18:10:31 +08:00
|
|
|
with transaction.commit_on_success_unless_managed(using=using, savepoint=False):
|
|
|
|
if not raw:
|
|
|
|
self._save_parents(cls, using, update_fields)
|
|
|
|
updated = self._save_table(raw, cls, force_insert, force_update, using, update_fields)
|
2009-12-22 23:18:51 +08:00
|
|
|
# Store the database on which the object was saved
|
|
|
|
self._state.db = using
|
2010-11-19 06:43:46 +08:00
|
|
|
# Once saved, this is no longer a to-be-added instance.
|
|
|
|
self._state.adding = False
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
# Signal that the save is complete
|
2012-11-29 18:10:31 +08:00
|
|
|
if not meta.auto_created:
|
|
|
|
signals.post_save.send(sender=origin, instance=self, created=(not updated),
|
2012-05-12 15:24:20 +08:00
|
|
|
update_fields=update_fields, raw=raw, using=using)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2008-05-13 22:56:47 +08:00
|
|
|
save_base.alters_data = True
|
|
|
|
|
2012-11-29 18:10:31 +08:00
|
|
|
def _save_parents(self, cls, using, update_fields):
|
|
|
|
"""
|
|
|
|
Saves all the parents of cls using values from self.
|
|
|
|
"""
|
|
|
|
meta = cls._meta
|
|
|
|
for parent, field in meta.parents.items():
|
|
|
|
# Make sure the link fields are synced between parent and self.
|
|
|
|
if (field and getattr(self, parent._meta.pk.attname) is None
|
|
|
|
and getattr(self, field.attname) is not None):
|
|
|
|
setattr(self, parent._meta.pk.attname, getattr(self, field.attname))
|
|
|
|
self._save_parents(cls=parent, using=using, update_fields=update_fields)
|
|
|
|
self._save_table(cls=parent, using=using, update_fields=update_fields)
|
|
|
|
# Set the parent's PK value to self.
|
|
|
|
if field:
|
|
|
|
setattr(self, field.attname, self._get_pk_val(parent._meta))
|
|
|
|
# Since we didn't have an instance of the parent handy set
|
|
|
|
# attname directly, bypassing the descriptor. Invalidate
|
|
|
|
# the related object cache, in case it's been accidentally
|
|
|
|
# populated. A fresh instance will be re-built from the
|
|
|
|
# database if necessary.
|
|
|
|
cache_name = field.get_cache_name()
|
|
|
|
if hasattr(self, cache_name):
|
|
|
|
delattr(self, cache_name)
|
|
|
|
|
|
|
|
def _save_table(self, raw=False, cls=None, force_insert=False,
|
|
|
|
force_update=False, using=None, update_fields=None):
|
|
|
|
"""
|
|
|
|
Does the heavy-lifting involved in saving. Updates or inserts the data
|
|
|
|
for a single table.
|
|
|
|
"""
|
|
|
|
meta = cls._meta
|
2013-03-25 00:40:40 +08:00
|
|
|
non_pks = [f for f in meta.local_concrete_fields if not f.primary_key]
|
2012-11-29 18:10:31 +08:00
|
|
|
|
|
|
|
if update_fields:
|
|
|
|
non_pks = [f for f in non_pks
|
|
|
|
if f.name in update_fields or f.attname in update_fields]
|
|
|
|
|
|
|
|
pk_val = self._get_pk_val(meta)
|
|
|
|
pk_set = pk_val is not None
|
|
|
|
if not pk_set and (force_update or update_fields):
|
|
|
|
raise ValueError("Cannot force an update in save() with no primary key.")
|
|
|
|
updated = False
|
|
|
|
# If possible, try an UPDATE. If that doesn't update anything, do an INSERT.
|
|
|
|
if pk_set and not force_insert:
|
|
|
|
base_qs = cls._base_manager.using(using)
|
2013-05-17 22:33:36 +08:00
|
|
|
values = [(f, None, (getattr(self, f.attname) if raw else f.pre_save(self, False)))
|
2012-11-29 18:10:31 +08:00
|
|
|
for f in non_pks]
|
2013-08-30 14:41:07 +08:00
|
|
|
forced_update = update_fields or force_update
|
|
|
|
updated = self._do_update(base_qs, using, pk_val, values, update_fields,
|
|
|
|
forced_update)
|
2012-11-29 18:10:31 +08:00
|
|
|
if force_update and not updated:
|
|
|
|
raise DatabaseError("Forced update did not affect any rows.")
|
|
|
|
if update_fields and not updated:
|
|
|
|
raise DatabaseError("Save with update_fields did not affect any rows.")
|
|
|
|
if not updated:
|
|
|
|
if meta.order_with_respect_to:
|
|
|
|
# If this is a model with an order_with_respect_to
|
|
|
|
# autopopulate the _order field
|
|
|
|
field = meta.order_with_respect_to
|
|
|
|
order_value = cls._base_manager.using(using).filter(
|
|
|
|
**{field.name: getattr(self, field.attname)}).count()
|
|
|
|
self._order = order_value
|
|
|
|
|
2013-03-25 00:40:40 +08:00
|
|
|
fields = meta.local_concrete_fields
|
2012-11-29 18:10:31 +08:00
|
|
|
if not pk_set:
|
|
|
|
fields = [f for f in fields if not isinstance(f, AutoField)]
|
|
|
|
|
|
|
|
update_pk = bool(meta.has_auto_field and not pk_set)
|
|
|
|
result = self._do_insert(cls._base_manager, using, fields, update_pk, raw)
|
|
|
|
if update_pk:
|
|
|
|
setattr(self, meta.pk.attname, result)
|
|
|
|
return updated
|
|
|
|
|
2013-08-30 14:41:07 +08:00
|
|
|
def _do_update(self, base_qs, using, pk_val, values, update_fields, forced_update):
|
2012-11-29 18:10:31 +08:00
|
|
|
"""
|
|
|
|
This method will try to update the model. If the model was updated (in
|
|
|
|
the sense that an update query was done and a matching row was found
|
|
|
|
from the DB) the method will return True.
|
|
|
|
"""
|
2013-08-30 14:41:07 +08:00
|
|
|
filtered = base_qs.filter(pk=pk_val)
|
2013-05-30 22:25:11 +08:00
|
|
|
if not values:
|
|
|
|
# We can end up here when saving a model in inheritance chain where
|
|
|
|
# update_fields doesn't target any field in current model. In that
|
|
|
|
# case we just say the update succeeded. Another case ending up here
|
|
|
|
# is a model with just PK - in that case check that the PK still
|
|
|
|
# exists.
|
2013-08-30 14:41:07 +08:00
|
|
|
return update_fields is not None or filtered.exists()
|
|
|
|
if self._meta.select_on_save and not forced_update:
|
|
|
|
if filtered.exists():
|
|
|
|
filtered._update(values)
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
return False
|
|
|
|
return filtered._update(values) > 0
|
2012-11-29 18:10:31 +08:00
|
|
|
|
|
|
|
def _do_insert(self, manager, using, fields, update_pk, raw):
|
|
|
|
"""
|
|
|
|
Do an INSERT. If update_pk is defined then this method should return
|
|
|
|
the new pk for the model.
|
|
|
|
"""
|
|
|
|
return manager._insert([self], fields=fields, return_id=update_pk,
|
|
|
|
using=using, raw=raw)
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def delete(self, using=None):
|
2010-01-22 22:30:06 +08:00
|
|
|
using = using or router.db_for_write(self.__class__, instance=self)
|
2006-05-02 09:31:56 +08:00
|
|
|
assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname)
|
|
|
|
|
2010-11-10 00:46:42 +08:00
|
|
|
collector = Collector(using=using)
|
|
|
|
collector.collect([self])
|
|
|
|
collector.delete()
|
2006-05-02 09:31:56 +08:00
|
|
|
|
|
|
|
delete.alters_data = True
|
|
|
|
|
|
|
|
def _get_FIELD_display(self, field):
|
|
|
|
value = getattr(self, field.attname)
|
2012-07-21 16:00:10 +08:00
|
|
|
return force_text(dict(field.flatchoices).get(value, value), strings_only=True)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2006-06-20 10:17:14 +08:00
|
|
|
def _get_next_or_previous_by_FIELD(self, field, is_next, **kwargs):
|
2010-09-11 08:20:35 +08:00
|
|
|
if not self.pk:
|
|
|
|
raise ValueError("get_next/get_previous cannot be used on unsaved objects.")
|
2013-05-17 22:33:36 +08:00
|
|
|
op = 'gt' if is_next else 'lt'
|
|
|
|
order = '' if is_next else '-'
|
2012-08-15 18:09:59 +08:00
|
|
|
param = force_text(getattr(self, field.attname))
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
q = Q(**{'%s__%s' % (field.name, op): param})
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
q = q | Q(**{field.name: param, 'pk__%s' % op: self.pk})
|
2009-12-22 23:18:51 +08:00
|
|
|
qs = self.__class__._default_manager.using(self._state.db).filter(**kwargs).filter(q).order_by('%s%s' % (order, field.name), '%spk' % order)
|
2006-05-07 02:46:53 +08:00
|
|
|
try:
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
return qs[0]
|
2006-05-24 03:55:30 +08:00
|
|
|
except IndexError:
|
2010-01-11 02:36:20 +08:00
|
|
|
raise self.DoesNotExist("%s matching query does not exist." % self.__class__._meta.object_name)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
|
|
|
def _get_next_or_previous_in_order(self, is_next):
|
|
|
|
cachename = "__%s_order_cache" % is_next
|
|
|
|
if not hasattr(self, cachename):
|
2013-05-17 22:33:36 +08:00
|
|
|
op = 'gt' if is_next else 'lt'
|
|
|
|
order = '_order' if is_next else '-_order'
|
2006-05-02 09:31:56 +08:00
|
|
|
order_field = self._meta.order_with_respect_to
|
2009-12-22 23:18:51 +08:00
|
|
|
obj = self._default_manager.filter(**{
|
|
|
|
order_field.name: getattr(self, order_field.attname)
|
|
|
|
}).filter(**{
|
|
|
|
'_order__%s' % op: self._default_manager.values('_order').filter(**{
|
|
|
|
self._meta.pk.name: self.pk
|
|
|
|
})
|
|
|
|
}).order_by(order)[:1].get()
|
2006-05-02 09:31:56 +08:00
|
|
|
setattr(self, cachename, obj)
|
|
|
|
return getattr(self, cachename)
|
|
|
|
|
2009-03-09 08:03:03 +08:00
|
|
|
def prepare_database_save(self, unused):
|
2013-09-07 06:13:51 +08:00
|
|
|
if self.pk is None:
|
|
|
|
raise ValueError("Unsaved model instance %r cannot be used in an ORM query." % self)
|
2009-03-09 08:03:03 +08:00
|
|
|
return self.pk
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2010-01-12 10:29:45 +08:00
|
|
|
def clean(self):
|
2010-01-05 11:56:19 +08:00
|
|
|
"""
|
|
|
|
Hook for doing any extra model-wide validation after clean() has been
|
2010-01-12 10:29:45 +08:00
|
|
|
called on every field by self.clean_fields. Any ValidationError raised
|
|
|
|
by this method will not be associated with a particular field; it will
|
|
|
|
have a special-case association with the field defined by NON_FIELD_ERRORS.
|
2010-01-05 11:56:19 +08:00
|
|
|
"""
|
2010-01-12 10:29:45 +08:00
|
|
|
pass
|
2010-01-05 11:56:19 +08:00
|
|
|
|
2010-01-12 10:29:45 +08:00
|
|
|
def validate_unique(self, exclude=None):
|
|
|
|
"""
|
|
|
|
Checks unique constraints on the model and raises ``ValidationError``
|
|
|
|
if any failed.
|
|
|
|
"""
|
|
|
|
unique_checks, date_checks = self._get_unique_checks(exclude=exclude)
|
2010-01-05 11:56:19 +08:00
|
|
|
|
|
|
|
errors = self._perform_unique_checks(unique_checks)
|
|
|
|
date_errors = self._perform_date_checks(date_checks)
|
|
|
|
|
|
|
|
for k, v in date_errors.items():
|
2010-01-12 22:26:17 +08:00
|
|
|
errors.setdefault(k, []).extend(v)
|
2010-01-05 11:56:19 +08:00
|
|
|
|
|
|
|
if errors:
|
|
|
|
raise ValidationError(errors)
|
|
|
|
|
2010-01-12 10:29:45 +08:00
|
|
|
def _get_unique_checks(self, exclude=None):
|
|
|
|
"""
|
|
|
|
Gather a list of checks to perform. Since validate_unique could be
|
|
|
|
called from a ModelForm, some fields may have been excluded; we can't
|
|
|
|
perform a unique check on a model that is missing fields involved
|
|
|
|
in that check.
|
2011-01-09 21:26:39 +08:00
|
|
|
Fields that did not validate should also be excluded, but they need
|
2010-01-12 10:29:45 +08:00
|
|
|
to be passed in via the exclude argument.
|
|
|
|
"""
|
|
|
|
if exclude is None:
|
|
|
|
exclude = []
|
|
|
|
unique_checks = []
|
2010-03-17 03:32:11 +08:00
|
|
|
|
|
|
|
unique_togethers = [(self.__class__, self._meta.unique_together)]
|
|
|
|
for parent_class in self._meta.parents.keys():
|
|
|
|
if parent_class._meta.unique_together:
|
|
|
|
unique_togethers.append((parent_class, parent_class._meta.unique_together))
|
|
|
|
|
|
|
|
for model_class, unique_together in unique_togethers:
|
|
|
|
for check in unique_together:
|
|
|
|
for name in check:
|
|
|
|
# If this is an excluded field, don't add this check.
|
|
|
|
if name in exclude:
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
unique_checks.append((model_class, tuple(check)))
|
2010-01-05 11:56:19 +08:00
|
|
|
|
2010-01-12 10:29:45 +08:00
|
|
|
# These are checks for the unique_for_<date/year/month>.
|
2010-01-05 11:56:19 +08:00
|
|
|
date_checks = []
|
|
|
|
|
|
|
|
# Gather a list of checks for fields declared as unique and add them to
|
2010-01-12 10:29:45 +08:00
|
|
|
# the list of checks.
|
2010-03-17 03:32:11 +08:00
|
|
|
|
|
|
|
fields_with_class = [(self.__class__, self._meta.local_fields)]
|
|
|
|
for parent_class in self._meta.parents.keys():
|
|
|
|
fields_with_class.append((parent_class, parent_class._meta.local_fields))
|
|
|
|
|
|
|
|
for model_class, fields in fields_with_class:
|
|
|
|
for f in fields:
|
|
|
|
name = f.name
|
|
|
|
if name in exclude:
|
|
|
|
continue
|
|
|
|
if f.unique:
|
|
|
|
unique_checks.append((model_class, (name,)))
|
2010-08-17 15:07:28 +08:00
|
|
|
if f.unique_for_date and f.unique_for_date not in exclude:
|
2010-03-17 03:32:11 +08:00
|
|
|
date_checks.append((model_class, 'date', name, f.unique_for_date))
|
2010-08-17 15:07:28 +08:00
|
|
|
if f.unique_for_year and f.unique_for_year not in exclude:
|
2010-03-17 03:32:11 +08:00
|
|
|
date_checks.append((model_class, 'year', name, f.unique_for_year))
|
2010-08-17 15:07:28 +08:00
|
|
|
if f.unique_for_month and f.unique_for_month not in exclude:
|
2010-03-17 03:32:11 +08:00
|
|
|
date_checks.append((model_class, 'month', name, f.unique_for_month))
|
2010-01-05 11:56:19 +08:00
|
|
|
return unique_checks, date_checks
|
|
|
|
|
|
|
|
def _perform_unique_checks(self, unique_checks):
|
|
|
|
errors = {}
|
|
|
|
|
2010-03-17 03:32:11 +08:00
|
|
|
for model_class, unique_check in unique_checks:
|
2010-01-05 11:56:19 +08:00
|
|
|
# Try to look up an existing object with the same values as this
|
|
|
|
# object's values for all the unique field.
|
|
|
|
|
|
|
|
lookup_kwargs = {}
|
|
|
|
for field_name in unique_check:
|
|
|
|
f = self._meta.get_field(field_name)
|
|
|
|
lookup_value = getattr(self, f.attname)
|
2010-01-15 01:04:53 +08:00
|
|
|
if lookup_value is None:
|
2010-01-05 11:56:19 +08:00
|
|
|
# no value, skip the lookup
|
|
|
|
continue
|
2010-11-19 06:43:46 +08:00
|
|
|
if f.primary_key and not self._state.adding:
|
2010-01-22 22:30:06 +08:00
|
|
|
# no need to check for unique primary key when editing
|
2010-01-05 11:56:19 +08:00
|
|
|
continue
|
|
|
|
lookup_kwargs[str(field_name)] = lookup_value
|
|
|
|
|
|
|
|
# some fields were skipped, no reason to do the check
|
2012-08-14 20:09:23 +08:00
|
|
|
if len(unique_check) != len(lookup_kwargs):
|
2010-01-05 11:56:19 +08:00
|
|
|
continue
|
|
|
|
|
2010-03-17 03:32:11 +08:00
|
|
|
qs = model_class._default_manager.filter(**lookup_kwargs)
|
2010-01-05 11:56:19 +08:00
|
|
|
|
|
|
|
# Exclude the current object from the query if we are editing an
|
|
|
|
# instance (as opposed to creating a new one)
|
2012-04-21 01:34:29 +08:00
|
|
|
# Note that we need to use the pk as defined by model_class, not
|
|
|
|
# self.pk. These can be different fields because model inheritance
|
|
|
|
# allows single model to have effectively multiple primary keys.
|
|
|
|
# Refs #17615.
|
|
|
|
model_class_pk = self._get_pk_val(model_class._meta)
|
|
|
|
if not self._state.adding and model_class_pk is not None:
|
|
|
|
qs = qs.exclude(pk=model_class_pk)
|
2010-01-05 12:12:09 +08:00
|
|
|
if qs.exists():
|
2010-01-05 11:56:19 +08:00
|
|
|
if len(unique_check) == 1:
|
|
|
|
key = unique_check[0]
|
|
|
|
else:
|
|
|
|
key = NON_FIELD_ERRORS
|
2010-03-17 03:32:11 +08:00
|
|
|
errors.setdefault(key, []).append(self.unique_error_message(model_class, unique_check))
|
2010-01-05 11:56:19 +08:00
|
|
|
|
|
|
|
return errors
|
|
|
|
|
|
|
|
def _perform_date_checks(self, date_checks):
|
|
|
|
errors = {}
|
2010-03-17 03:32:11 +08:00
|
|
|
for model_class, lookup_type, field, unique_for in date_checks:
|
2010-01-05 11:56:19 +08:00
|
|
|
lookup_kwargs = {}
|
|
|
|
# there's a ticket to add a date lookup, we can remove this special
|
|
|
|
# case if that makes it's way in
|
|
|
|
date = getattr(self, unique_for)
|
2011-01-09 21:26:39 +08:00
|
|
|
if date is None:
|
|
|
|
continue
|
2010-01-05 11:56:19 +08:00
|
|
|
if lookup_type == 'date':
|
|
|
|
lookup_kwargs['%s__day' % unique_for] = date.day
|
|
|
|
lookup_kwargs['%s__month' % unique_for] = date.month
|
|
|
|
lookup_kwargs['%s__year' % unique_for] = date.year
|
|
|
|
else:
|
|
|
|
lookup_kwargs['%s__%s' % (unique_for, lookup_type)] = getattr(date, lookup_type)
|
|
|
|
lookup_kwargs[field] = getattr(self, field)
|
|
|
|
|
2010-03-17 03:32:11 +08:00
|
|
|
qs = model_class._default_manager.filter(**lookup_kwargs)
|
2010-01-05 11:56:19 +08:00
|
|
|
# Exclude the current object from the query if we are editing an
|
|
|
|
# instance (as opposed to creating a new one)
|
2010-11-19 06:43:46 +08:00
|
|
|
if not self._state.adding and self.pk is not None:
|
2010-01-05 11:56:19 +08:00
|
|
|
qs = qs.exclude(pk=self.pk)
|
|
|
|
|
2010-01-05 12:30:51 +08:00
|
|
|
if qs.exists():
|
2010-01-05 11:56:19 +08:00
|
|
|
errors.setdefault(field, []).append(
|
|
|
|
self.date_error_message(lookup_type, field, unique_for)
|
|
|
|
)
|
|
|
|
return errors
|
|
|
|
|
|
|
|
def date_error_message(self, lookup_type, field, unique_for):
|
|
|
|
opts = self._meta
|
2012-06-08 00:08:47 +08:00
|
|
|
return _("%(field_name)s must be unique for %(date_field)s %(lookup)s.") % {
|
2012-07-20 20:48:51 +08:00
|
|
|
'field_name': six.text_type(capfirst(opts.get_field(field).verbose_name)),
|
|
|
|
'date_field': six.text_type(capfirst(opts.get_field(unique_for).verbose_name)),
|
2010-01-05 11:56:19 +08:00
|
|
|
'lookup': lookup_type,
|
|
|
|
}
|
|
|
|
|
2010-03-17 03:32:11 +08:00
|
|
|
def unique_error_message(self, model_class, unique_check):
|
|
|
|
opts = model_class._meta
|
2010-01-05 11:56:19 +08:00
|
|
|
model_name = capfirst(opts.verbose_name)
|
|
|
|
|
|
|
|
# A unique field
|
|
|
|
if len(unique_check) == 1:
|
|
|
|
field_name = unique_check[0]
|
2011-06-09 23:05:13 +08:00
|
|
|
field = opts.get_field(field_name)
|
|
|
|
field_label = capfirst(field.verbose_name)
|
2010-01-05 11:56:19 +08:00
|
|
|
# Insert the error into the error dict, very sneaky
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
return field.error_messages['unique'] % {
|
2012-07-20 20:48:51 +08:00
|
|
|
'model_name': six.text_type(model_name),
|
|
|
|
'field_label': six.text_type(field_label)
|
2010-01-05 11:56:19 +08:00
|
|
|
}
|
|
|
|
# unique_together
|
|
|
|
else:
|
2012-08-14 20:36:11 +08:00
|
|
|
field_labels = [capfirst(opts.get_field(f).verbose_name) for f in unique_check]
|
2010-01-05 11:56:19 +08:00
|
|
|
field_labels = get_text_list(field_labels, _('and'))
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
return _("%(model_name)s with this %(field_label)s already exists.") % {
|
2012-07-20 20:48:51 +08:00
|
|
|
'model_name': six.text_type(model_name),
|
|
|
|
'field_label': six.text_type(field_labels)
|
2010-01-05 11:56:19 +08:00
|
|
|
}
|
|
|
|
|
2013-04-05 03:21:57 +08:00
|
|
|
def full_clean(self, exclude=None, validate_unique=True):
|
2010-01-12 10:29:45 +08:00
|
|
|
"""
|
|
|
|
Calls clean_fields, clean, and validate_unique, on the model,
|
2013-03-29 01:16:53 +08:00
|
|
|
and raises a ``ValidationError`` for any errors that occurred.
|
2010-01-12 10:29:45 +08:00
|
|
|
"""
|
|
|
|
errors = {}
|
|
|
|
if exclude is None:
|
|
|
|
exclude = []
|
|
|
|
|
|
|
|
try:
|
|
|
|
self.clean_fields(exclude=exclude)
|
2012-04-29 00:09:37 +08:00
|
|
|
except ValidationError as e:
|
2010-01-12 10:29:45 +08:00
|
|
|
errors = e.update_error_dict(errors)
|
|
|
|
|
|
|
|
# Form.clean() is run even if other validation fails, so do the
|
|
|
|
# same with Model.clean() for consistency.
|
|
|
|
try:
|
|
|
|
self.clean()
|
2012-04-29 00:09:37 +08:00
|
|
|
except ValidationError as e:
|
2010-01-12 10:29:45 +08:00
|
|
|
errors = e.update_error_dict(errors)
|
|
|
|
|
|
|
|
# Run unique checks, but only for fields that passed validation.
|
2013-04-05 03:21:57 +08:00
|
|
|
if validate_unique:
|
|
|
|
for name in errors.keys():
|
|
|
|
if name != NON_FIELD_ERRORS and name not in exclude:
|
|
|
|
exclude.append(name)
|
|
|
|
try:
|
|
|
|
self.validate_unique(exclude=exclude)
|
|
|
|
except ValidationError as e:
|
|
|
|
errors = e.update_error_dict(errors)
|
2010-01-12 10:29:45 +08:00
|
|
|
|
|
|
|
if errors:
|
|
|
|
raise ValidationError(errors)
|
|
|
|
|
|
|
|
def clean_fields(self, exclude=None):
|
2010-01-05 11:56:19 +08:00
|
|
|
"""
|
2010-01-12 10:29:45 +08:00
|
|
|
Cleans all fields and raises a ValidationError containing message_dict
|
2010-01-05 11:56:19 +08:00
|
|
|
of all validation errors if any occur.
|
|
|
|
"""
|
2010-01-12 10:29:45 +08:00
|
|
|
if exclude is None:
|
|
|
|
exclude = []
|
|
|
|
|
2010-01-05 11:56:19 +08:00
|
|
|
errors = {}
|
|
|
|
for f in self._meta.fields:
|
|
|
|
if f.name in exclude:
|
|
|
|
continue
|
2010-01-12 10:29:45 +08:00
|
|
|
# Skip validation for empty fields with blank=True. The developer
|
|
|
|
# is responsible for making sure they have a valid value.
|
|
|
|
raw_value = getattr(self, f.attname)
|
2013-03-06 23:58:04 +08:00
|
|
|
if f.blank and raw_value in f.empty_values:
|
2010-01-12 10:29:45 +08:00
|
|
|
continue
|
2010-01-05 11:56:19 +08:00
|
|
|
try:
|
2010-01-12 10:29:45 +08:00
|
|
|
setattr(self, f.attname, f.clean(raw_value, self))
|
2012-04-29 00:09:37 +08:00
|
|
|
except ValidationError as e:
|
2013-04-05 03:21:57 +08:00
|
|
|
errors[f.name] = e.error_list
|
2010-01-05 11:56:19 +08:00
|
|
|
|
|
|
|
if errors:
|
|
|
|
raise ValidationError(errors)
|
|
|
|
|
2008-07-09 05:53:38 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
############################################
|
|
|
|
# HELPER FUNCTIONS (CURRIED MODEL METHODS) #
|
|
|
|
############################################
|
|
|
|
|
|
|
|
# ORDERING METHODS #########################
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def method_set_order(ordered_obj, self, id_list, using=None):
|
|
|
|
if using is None:
|
|
|
|
using = DEFAULT_DB_ALIAS
|
2006-06-28 09:16:32 +08:00
|
|
|
rel_val = getattr(self, ordered_obj._meta.order_with_respect_to.rel.field_name)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
order_name = ordered_obj._meta.order_with_respect_to.name
|
|
|
|
# FIXME: It would be nice if there was an "update many" version of update
|
|
|
|
# for situations like this.
|
2013-03-04 20:12:59 +08:00
|
|
|
with transaction.commit_on_success_unless_managed(using=using):
|
|
|
|
for i, j in enumerate(id_list):
|
|
|
|
ordered_obj.objects.filter(**{'pk': j, order_name: rel_val}).update(_order=i)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2008-07-09 05:53:38 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def method_get_order(ordered_obj, self):
|
|
|
|
rel_val = getattr(self, ordered_obj._meta.order_with_respect_to.rel.field_name)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
order_name = ordered_obj._meta.order_with_respect_to.name
|
|
|
|
pk_name = ordered_obj._meta.pk.name
|
|
|
|
return [r[pk_name] for r in
|
|
|
|
ordered_obj.objects.filter(**{order_name: rel_val}).values(pk_name)]
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2008-07-09 05:53:38 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
##############################################
|
|
|
|
# HELPER FUNCTIONS (CURRIED MODEL FUNCTIONS) #
|
|
|
|
##############################################
|
|
|
|
|
2007-11-30 00:32:09 +08:00
|
|
|
def get_absolute_url(opts, func, self, *args, **kwargs):
|
2013-02-05 17:16:07 +08:00
|
|
|
return settings.ABSOLUTE_URL_OVERRIDES.get('%s.%s' % (opts.app_label, opts.model_name), func)(self, *args, **kwargs)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2008-07-09 05:53:38 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
########
|
|
|
|
# MISC #
|
|
|
|
########
|
|
|
|
|
|
|
|
|
2013-05-21 17:57:24 +08:00
|
|
|
def simple_class_factory(model, attrs):
|
|
|
|
"""
|
|
|
|
Needed for dynamic classes.
|
|
|
|
"""
|
|
|
|
return model
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
|
2013-07-08 08:39:54 +08:00
|
|
|
|
2013-05-21 17:57:24 +08:00
|
|
|
def model_unpickle(model_id, attrs, factory):
|
2009-03-19 17:06:04 +08:00
|
|
|
"""
|
|
|
|
Used to unpickle Model subclasses with deferred fields.
|
|
|
|
"""
|
2013-05-21 17:57:24 +08:00
|
|
|
if isinstance(model_id, tuple):
|
|
|
|
model = get_model(*model_id)
|
|
|
|
else:
|
|
|
|
# Backwards compat - the model was cached directly in earlier versions.
|
|
|
|
model = model_id
|
|
|
|
cls = factory(model, attrs)
|
2009-03-19 17:06:04 +08:00
|
|
|
return cls.__new__(cls)
|
|
|
|
model_unpickle.__safe_for_unpickle__ = True
|
|
|
|
|
Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.
Squashed commit of the following:
commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 18:37:04 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed Sep 26 07:09:23 2012 +0800
Merged recent trunk changes.
commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:49:46 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 24 07:48:05 2012 +0800
Ensure sequences are reset correctly in the presence of swapped models.
commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 17:53:05 2012 +0800
Modifications to the handling and docs for auth forms.
commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 15:28:57 2012 +0800
Improved error handling and docs for get_user_model()
commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 23 14:50:11 2012 +0800
Merged recent Django trunk changes.
commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 21:38:44 2012 +0800
Improved validation of swappable model settings.
commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Sep 17 07:15:14 2012 +0800
Removed some unused imports.
commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:31:28 2012 +0800
Corrected attribute access on for get_by_natural_key
commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 20:12:34 2012 +0800
Added test for proxy model safeguards on swappable models.
commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:16:49 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 18:09:27 2012 +0800
Fixes for Python 3 compatibility.
commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:54:30 2012 +0800
Added protection against proxying swapped models.
commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 15:11:10 2012 +0800
Cleanup and documentation of AbstractUser base class.
commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:46:49 2012 +0800
Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 14:20:14 2012 +0800
Documentation improvements coming from community review.
commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:52:47 2012 +0800
Refactored skipIfCustomUser into the contrib.auth tests.
commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:46:10 2012 +0800
Refactored common 'get' pattern into manager method.
commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 16 13:41:33 2012 +0800
Added note about backwards incompatible change to admin login messages.
commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:33 2012 +0300
Splitted User to AbstractUser and User
commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date: Sat Sep 15 18:30:02 2012 +0300
Reworked REQUIRED_FIELDS + create_user() interaction
commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:37 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:18:19 2012 +0800
Deprecate AUTH_PROFILE_MODULE and get_profile().
commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 20:00:12 2012 +0800
Added release notes for new swappable User feature.
commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 19:59:49 2012 +0800
Ensure swapped models can't be queried.
commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 15 14:31:54 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:29:51 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 08:22:26 2012 +0800
Merge recent changes from master.
commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 07:53:46 2012 +0800
Corrected admin_views tests following removal of the email fallback on admin logins.
commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun Sep 9 01:00:37 2012 +0800
Added conditional skips for all tests dependent on the default User model
commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:47:02 2012 +0800
Added documentation for REQUIRED_FIELDS in custom auth.
commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat Sep 8 23:20:02 2012 +0800
Added first draft of custom User docs.
Thanks to Greg Turner for the initial text.
commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 11:17:26 2012 +0800
Admin app should not allow username discovery
The admin app login form should not allow users to discover the username
associated with an email address.
commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date: Mon Aug 20 10:32:13 2012 +0800
Admin app login form should use swapped user model
commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri Sep 7 23:45:03 2012 +0800
Merged master changes.
commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:12:57 2012 +0800
Merge remote-tracking branch 'django/master' into t3011
commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Aug 20 13:09:09 2012 +0800
Merged recent changes from trunk.
commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:41:37 2012 +0800
Modified auth app so that login with alternate auth app is possible.
commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 20:10:51 2012 +0800
Modified auth management commands to handle custom user definitions.
commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon Jun 4 14:17:28 2012 +0800
Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
|
|
|
|
2012-06-22 20:28:15 +08:00
|
|
|
def unpickle_inner_exception(klass, exception_name):
|
|
|
|
# Get the exception class from the class it is attached to:
|
|
|
|
exception = getattr(klass, exception_name)
|
|
|
|
return exception.__new__(exception)
|