Merge lp:~jml/python-fixtures/upcall-tweak into lp:~python-fixtures/python-fixtures/trunk

[Jonathan Lange]

This just changes the direct upcall to use super(), as per bug 881120.

[Robert Collins (lifeless)]

thanks

review: Approve

=== modified file 'lib/fixtures/_fixtures/environ.py'
--- lib/fixtures/_fixtures/environ.py	2010-10-17 09:45:38 +0000
+++ lib/fixtures/_fixtures/environ.py	2011-10-31 16:32:26 +0000
@@ -1,12 +1,12 @@
 #  fixtures: Fixtures with cleanups for testing and convenience.
 #
-# Copyright (c) 2010, Robert Collins <[e-mail]>
-# 
+# Copyright (c) 2010, 2011, Robert Collins <[e-mail]>
+#
 # 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 @@
         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: