diff options
| author | Robert Collins <robertc@robertcollins.net> | 2011-11-22 22:26:54 +1300 |
|---|---|---|
| committer | Robert Collins <robertc@robertcollins.net> | 2011-11-22 22:26:54 +1300 |
| commit | f03b5f4126e0596e5ac96868bd9f9642a43d52ac (patch) | |
| tree | 777d5059c5e225b484df838a975004718211e0d2 | |
| parent | 5e8ed8bf93ae648f48d35d2780011503268f0183 (diff) | |
| parent | de0589d1f0e80eb4814bb6930b9167893079666c (diff) | |
| download | fixtures-git-f03b5f4126e0596e5ac96868bd9f9642a43d52ac.tar.gz | |
EnvironmentVariableFixture now upcalls via super.
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | lib/fixtures/_fixtures/environ.py | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -6,6 +6,11 @@ fixtures release notes IN DEVELOPMENT ~~~~~~~~~~~~~~ +CHANGES: + +* EnvironmentVariableFixture now upcalls via super(). + (Jonathan Lange, #881120) + 0.3.7 ~~~~~ diff --git a/lib/fixtures/_fixtures/environ.py b/lib/fixtures/_fixtures/environ.py index fe846e7..a0f36cc 100644 --- a/lib/fixtures/_fixtures/environ.py +++ b/lib/fixtures/_fixtures/environ.py @@ -1,12 +1,12 @@ # fixtures: Fixtures with cleanups for testing and convenience. # -# Copyright (c) 2010, Robert Collins <robertc@robertcollins.net> -# +# Copyright (c) 2010, 2011, Robert Collins <robertc@robertcollins.net> +# # Licensed under either the Apache License, Version 2.0 or the BSD 3-clause # license at the users choice. A copy of both licenses are available in the # project source as Apache-2.0 and BSD. You may not use this file except in # compliance with one of these two licences. -# +# # Unless required by applicable law or agreed to in writing, software # distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -38,9 +38,9 @@ class EnvironmentVariableFixture(Fixture): Fixture.__init__(self) self.varname = varname self.newvalue = newvalue - + def setUp(self): - Fixture.setUp(self) + super(EnvironmentVariableFixture, self).setUp() varname = self.varname orig_value = os.environ.get(varname) if orig_value is not None: |