diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2013-07-30 12:08:59 +0100 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2013-07-30 12:08:59 +0100 |
| commit | 12e9804d163777af17cc2a3dfdfff49e5f750ebd (patch) | |
| tree | de245c81bba1b8cb8e4cc28b8abd60f8ade5b61e /django/contrib | |
| parent | 68e0a169c4f9fa7f8071e014b274fd59e970f9a3 (diff) | |
Rename allow_syncdb to allow_migrate
Diffstat (limited to 'django/contrib')
| -rw-r--r-- | django/contrib/auth/management/__init__.py | 2 | ||||
| -rw-r--r-- | django/contrib/contenttypes/management.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/tests/layermap/tests.py | 2 | ||||
| -rw-r--r-- | django/contrib/sites/management.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py index e1b9be2e9b..343828ec17 100644 --- a/django/contrib/auth/management/__init__.py +++ b/django/contrib/auth/management/__init__.py @@ -64,7 +64,7 @@ def create_permissions(app, created_models, verbosity, db=DEFAULT_DB_ALIAS, **kw except UnavailableApp: return - if not router.allow_syncdb(db, auth_app.Permission): + if not router.allow_migrate(db, auth_app.Permission): return from django.contrib.contenttypes.models import ContentType diff --git a/django/contrib/contenttypes/management.py b/django/contrib/contenttypes/management.py index 21a34b2bfa..4278bbd1e7 100644 --- a/django/contrib/contenttypes/management.py +++ b/django/contrib/contenttypes/management.py @@ -16,7 +16,7 @@ def update_contenttypes(app, created_models, verbosity=2, db=DEFAULT_DB_ALIAS, * except UnavailableApp: return - if not router.allow_syncdb(db, ContentType): + if not router.allow_migrate(db, ContentType): return ContentType.objects.clear_cache() diff --git a/django/contrib/gis/tests/layermap/tests.py b/django/contrib/gis/tests/layermap/tests.py index c4c27b353e..3b040624f3 100644 --- a/django/contrib/gis/tests/layermap/tests.py +++ b/django/contrib/gis/tests/layermap/tests.py @@ -311,7 +311,7 @@ class OtherRouter(object): def allow_relation(self, obj1, obj2, **hints): return None - def allow_syncdb(self, db, model): + def allow_migrate(self, db, model): return True diff --git a/django/contrib/sites/management.py b/django/contrib/sites/management.py index 3ab49e5482..d9e3a2126c 100644 --- a/django/contrib/sites/management.py +++ b/django/contrib/sites/management.py @@ -11,7 +11,7 @@ from django.core.management.color import no_style def create_default_site(app, created_models, verbosity, db, **kwargs): # Only create the default sites in databases where Django created the table - if Site in created_models and router.allow_syncdb(db, Site) : + if Site in created_models and router.allow_migrate(db, Site) : # The default settings set SITE_ID = 1, and some tests in Django's test # suite rely on this value. However, if database sequences are reused # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that |
