summaryrefslogtreecommitdiff
path: root/tests/modeltests/proxy_model_inheritance/tests.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-06-07 17:52:53 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-06-07 17:52:53 +0000
commita61b34b048d84b2a8af78a42a4e635371252bd3f (patch)
tree6c0733ffe75a10b95719ac7b99bcd9b9abc6b578 /tests/modeltests/proxy_model_inheritance/tests.py
parent9d3e6668d91af5ef442d07192b5508707d7e0a2a (diff)
[soc2010/query-refactor] Merged up to trunk r13328.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/modeltests/proxy_model_inheritance/tests.py')
-rw-r--r--tests/modeltests/proxy_model_inheritance/tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/modeltests/proxy_model_inheritance/tests.py b/tests/modeltests/proxy_model_inheritance/tests.py
index a07958a13b..d10d6a4ac1 100644
--- a/tests/modeltests/proxy_model_inheritance/tests.py
+++ b/tests/modeltests/proxy_model_inheritance/tests.py
@@ -23,9 +23,9 @@ class ProxyModelInheritanceTests(TransactionTestCase):
settings.INSTALLED_APPS = ('app1', 'app2')
map(load_app, settings.INSTALLED_APPS)
call_command('syncdb', verbosity=0)
+ global ProxyModel, NiceModel
from app1.models import ProxyModel
from app2.models import NiceModel
- global ProxyModel, NiceModel
def tearDown(self):
settings.INSTALLED_APPS = self.old_installed_apps