diff options
author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2012-04-29 19:56:49 (GMT) |
---|---|---|
committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2012-04-29 19:56:49 (GMT) |
commit | 2420d831582a5403d679b6383933112948d476fe (patch) | |
tree | a7c62c90314436f1442457f484bd25508d92fad8 /Lib/test/support.py | |
parent | ea7e9f9a83a88325e599d0a7b31122e50495a5aa (diff) | |
download | cpython-2420d831582a5403d679b6383933112948d476fe.zip cpython-2420d831582a5403d679b6383933112948d476fe.tar.gz cpython-2420d831582a5403d679b6383933112948d476fe.tar.bz2 |
Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near
the DST transition. Patch by Joe Peterson.
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r-- | Lib/test/support.py | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index 01cd203..0526b14 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -53,7 +53,7 @@ __all__ = [ "reap_children", "cpython_only", "check_impl_detail", "get_attribute", "swap_item", "swap_attr", "requires_IEEE_754", "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink", - "import_fresh_module", "failfast", + "import_fresh_module", "failfast", "run_with_tz" ] class Error(Exception): @@ -1021,6 +1021,35 @@ def run_with_locale(catstr, *locales): return decorator #======================================================================= +# Decorator for running a function in a specific timezone, correctly +# resetting it afterwards. + +def run_with_tz(tz): + def decorator(func): + def inner(*args, **kwds): + if 'TZ' in os.environ: + orig_tz = os.environ['TZ'] + else: + orig_tz = None + os.environ['TZ'] = tz + time.tzset() + + # now run the function, resetting the tz on exceptions + try: + return func(*args, **kwds) + finally: + if orig_tz == None: + del os.environ['TZ'] + else: + os.environ['TZ'] = orig_tz + time.tzset() + + inner.__name__ = func.__name__ + inner.__doc__ = func.__doc__ + return inner + return decorator + +#======================================================================= # Big-memory-test support. Separate from 'resources' because memory use # should be configurable. |