[Python-checkins] cpython (merge 3.2 -> default): merged

[alexander.belopolsky]

http://hg.python.org/cpython/rev/56becb6716fd
changeset:   76652:56becb6716fd
parent:      76650:e393d83d6877
parent:      76651:f23222d734bd
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Apr 29 18:20:05 2012 -0400
summary:
  merged

files:
  Lib/test/support.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -1106,12 +1106,16 @@
 def run_with_tz(tz):
     def decorator(func):
         def inner(*args, **kwds):
+            try:
+                tzset = time.tzset
+            except AttributeError:
+                raise unittest.SkipTest("tzset required")
             if 'TZ' in os.environ:
                 orig_tz = os.environ['TZ']
             else:
                 orig_tz = None
             os.environ['TZ'] = tz
-            time.tzset()
+            tzset()
 
             # now run the function, resetting the tz on exceptions
             try:

-- 
Repository URL: http://hg.python.org/cpython