summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-02-26 15:33:27 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-02-26 15:33:27 +0000
commit46cc7021a8ab60190d81e9d7e039cd84efbafb23 (patch)
tree5f809c291af834fb5a2cd2d122ca849c26062ae3 /tests
parent0ff624a3cb075800e6c84cf80e36b085e23cf270 (diff)
Fixed #1480 -- Added the ability to use the system timezone. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/app_loading/tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/regressiontests/app_loading/tests.py b/tests/regressiontests/app_loading/tests.py
index 683c6079ad..a1273dfeb0 100644
--- a/tests/regressiontests/app_loading/tests.py
+++ b/tests/regressiontests/app_loading/tests.py
@@ -19,7 +19,7 @@ Test the globbing of INSTALLED_APPS.
>>> sys.path = old_sys_path
# Undo a side-effect of installing a new settings object.
->>> if hasattr(time, "tzset"):
+>>> if hasattr(time, "tzset") and old_tz:
... os.environ["TZ"] = old_tz
... time.tzset()