mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 15:09:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merged

Browse source
This commit is contained in:
Alexander Belopolsky 2012-04-29 18:20:05 -04:00
commit 934cb18ef5
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/support.py
View file

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