Loading django/contrib/auth/tests/test_basic.py +0 −1 Original line number Diff line number Diff line Loading @@ -23,7 +23,6 @@ from django.utils.six import binary_type, PY2, StringIO def user_model_swapped(**kwargs): if kwargs['setting'] == 'AUTH_USER_MODEL': from django.db.models.manager import ensure_default_manager from django.contrib.auth.models import User # Reset User manager setattr(User, 'objects', User._default_manager) ensure_default_manager(User) Loading django/contrib/gis/geos/prototypes/__init__.py +1 −1 Original line number Diff line number Diff line Loading @@ -24,7 +24,7 @@ from django.contrib.gis.geos.prototypes.misc import * from django.contrib.gis.geos.prototypes.predicates import (geos_hasz, geos_isempty, geos_isring, geos_issimple, geos_isvalid, geos_contains, geos_crosses, geos_disjoint, geos_equals, geos_equalsexact, geos_intersects, geos_intersects, geos_overlaps, geos_relatepattern, geos_touches, geos_within) geos_overlaps, geos_relatepattern, geos_touches, geos_within) # Topology routines from django.contrib.gis.geos.prototypes.topology import * django/contrib/sitemaps/__init__.py +0 −1 Original line number Diff line number Diff line Loading @@ -30,7 +30,6 @@ def ping_google(sitemap_url=None, ping_url=PING_URL): if sitemap_url is None: raise SitemapNotFound("You didn't provide a sitemap_url, and the sitemap URL couldn't be auto-detected.") from django.contrib.sites.models import Site current_site = Site.objects.get_current() url = "http://%s%s" % (current_site.domain, sitemap_url) params = urlencode({'sitemap':url}) Loading django/db/backends/mysql/base.py +0 −1 Original line number Diff line number Diff line Loading @@ -43,7 +43,6 @@ from django.db.backends.mysql.introspection import DatabaseIntrospection from django.db.backends.mysql.validation import DatabaseValidation from django.utils.encoding import force_str, force_text from django.db.backends.mysql.schema import DatabaseSchemaEditor from django.utils.encoding import force_str from django.utils.functional import cached_property from django.utils.safestring import SafeBytes, SafeText from django.utils import six Loading django/db/migrations/state.py +3 −3 Original line number Diff line number Diff line Loading @@ -53,11 +53,11 @@ class ProjectState(object): @classmethod def from_app_cache(cls, app_cache): "Takes in an AppCache and returns a ProjectState matching it" models = {} app_models = {} for model in app_cache.get_models(): model_state = ModelState.from_model(model) models[(model_state.app_label, model_state.name.lower())] = model_state return cls(models) app_models[(model_state.app_label, model_state.name.lower())] = model_state return cls(app_models) def __eq__(self, other): if set(self.models.keys()) != set(other.models.keys()): Loading Loading
django/contrib/auth/tests/test_basic.py +0 −1 Original line number Diff line number Diff line Loading @@ -23,7 +23,6 @@ from django.utils.six import binary_type, PY2, StringIO def user_model_swapped(**kwargs): if kwargs['setting'] == 'AUTH_USER_MODEL': from django.db.models.manager import ensure_default_manager from django.contrib.auth.models import User # Reset User manager setattr(User, 'objects', User._default_manager) ensure_default_manager(User) Loading
django/contrib/gis/geos/prototypes/__init__.py +1 −1 Original line number Diff line number Diff line Loading @@ -24,7 +24,7 @@ from django.contrib.gis.geos.prototypes.misc import * from django.contrib.gis.geos.prototypes.predicates import (geos_hasz, geos_isempty, geos_isring, geos_issimple, geos_isvalid, geos_contains, geos_crosses, geos_disjoint, geos_equals, geos_equalsexact, geos_intersects, geos_intersects, geos_overlaps, geos_relatepattern, geos_touches, geos_within) geos_overlaps, geos_relatepattern, geos_touches, geos_within) # Topology routines from django.contrib.gis.geos.prototypes.topology import *
django/contrib/sitemaps/__init__.py +0 −1 Original line number Diff line number Diff line Loading @@ -30,7 +30,6 @@ def ping_google(sitemap_url=None, ping_url=PING_URL): if sitemap_url is None: raise SitemapNotFound("You didn't provide a sitemap_url, and the sitemap URL couldn't be auto-detected.") from django.contrib.sites.models import Site current_site = Site.objects.get_current() url = "http://%s%s" % (current_site.domain, sitemap_url) params = urlencode({'sitemap':url}) Loading
django/db/backends/mysql/base.py +0 −1 Original line number Diff line number Diff line Loading @@ -43,7 +43,6 @@ from django.db.backends.mysql.introspection import DatabaseIntrospection from django.db.backends.mysql.validation import DatabaseValidation from django.utils.encoding import force_str, force_text from django.db.backends.mysql.schema import DatabaseSchemaEditor from django.utils.encoding import force_str from django.utils.functional import cached_property from django.utils.safestring import SafeBytes, SafeText from django.utils import six Loading
django/db/migrations/state.py +3 −3 Original line number Diff line number Diff line Loading @@ -53,11 +53,11 @@ class ProjectState(object): @classmethod def from_app_cache(cls, app_cache): "Takes in an AppCache and returns a ProjectState matching it" models = {} app_models = {} for model in app_cache.get_models(): model_state = ModelState.from_model(model) models[(model_state.app_label, model_state.name.lower())] = model_state return cls(models) app_models[(model_state.app_label, model_state.name.lower())] = model_state return cls(app_models) def __eq__(self, other): if set(self.models.keys()) != set(other.models.keys()): Loading