diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2009-11-01 23:13:59 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2009-11-01 23:13:59 +0000 |
| commit | 13d83908a4fa15570c265d310f2ecc4295bd7411 (patch) | |
| tree | f744deceb4ff69c3cd11d7235d5d4c3cf4857699 | |
| parent | 8061665c2785a10c26f4dd770a02d89cb8c49c68 (diff) | |
[1.1.X] Changed setUp and tearDown for the tests converted from doctests in r11695
to not assume TZ absolutely will be set in the environment. That environment
variable does not necessarily exist on Windows, it seems.
r11699 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | tests/regressiontests/utils/dateformat.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/regressiontests/utils/dateformat.py b/tests/regressiontests/utils/dateformat.py index 6afbcd61ec..2ff3441486 100644 --- a/tests/regressiontests/utils/dateformat.py +++ b/tests/regressiontests/utils/dateformat.py @@ -6,11 +6,14 @@ from django.utils.tzinfo import FixedOffset, LocalTimezone class DateFormatTests(TestCase): def setUp(self): - self.old_TZ = os.environ['TZ'] + self.old_TZ = os.environ.get('TZ') os.environ['TZ'] = 'Europe/Copenhagen' def tearDown(self): - os.environ['TZ'] = self.old_TZ + if self.old_TZ is None: + del os.environ['TZ'] + else: + os.environ['TZ'] = self.old_TZ def test_date(self): d = date(2009, 5, 16) |