summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/regressiontests/dateformat/tests.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/regressiontests/dateformat/tests.py b/tests/regressiontests/dateformat/tests.py
index 93418d2f63..3a19d26e19 100644
--- a/tests/regressiontests/dateformat/tests.py
+++ b/tests/regressiontests/dateformat/tests.py
@@ -5,12 +5,15 @@ import datetime, os, time
class DateFormatTests(TestCase):
def setUp(self):
- self.old_TZ = os.environ['TZ']
+ self.old_TZ = os.environ.get('TZ')
os.environ['TZ'] = 'Europe/Copenhagen'
translation.activate('en-us')
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_empty_format(self):
my_birthday = datetime.datetime(1979, 7, 8, 22, 00)
@@ -80,4 +83,4 @@ class DateFormatTests(TestCase):
self.assertEquals(dateformat.format(wintertime, 'O'), u'+0100')
except AttributeError:
# No timezone available. Don't run the tests
- pass \ No newline at end of file
+ pass