From 6c42c429cbda623681c7db28f7943ad3c458a989 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 13 Mar 2010 22:19:58 -0500 Subject: Who would have thought getting missing environment vars right would require so many tries --- test/coveragetest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/coveragetest.py b/test/coveragetest.py index 6366970f..8e15e49d 100644 --- a/test/coveragetest.py +++ b/test/coveragetest.py @@ -90,9 +90,12 @@ class CoverageTest(TestCase): def original_environ(self, name, if_missing=None): """The environment variable `name` from when the test started.""" if name in self.environ_undos: - return self.environ_undos[name] + ret = self.environ_undos[name] else: - return os.environ.get(name, if_missing) + ret = os.environ.get(name) + if ret is None: + ret = if_missing + return ret def undo_environ(self): """Undo all the changes made by `set_environ`.""" -- cgit v1.2.1