diff options
author | Yaron de Leeuw <me@jarondl.net> | 2014-11-29 14:31:29 +0200 |
---|---|---|
committer | Yaron de Leeuw <me@jarondl.net> | 2014-11-29 14:31:29 +0200 |
commit | ae3a21e97c256a93eff18b6e856aed8ea75f15f2 (patch) | |
tree | 5db4eae1c64d69026e2543fc28369102edf970ad /dateutil/tzwin.py | |
parent | 4f81f55a6e123c5f079d5a5eeb6a6ea1f58fe644 (diff) | |
download | dateutil-ae3a21e97c256a93eff18b6e856aed8ea75f15f2.tar.gz |
FIX: tzwin on windows, sort of revert the previous commit
Diffstat (limited to 'dateutil/tzwin.py')
-rw-r--r-- | dateutil/tzwin.py | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/dateutil/tzwin.py b/dateutil/tzwin.py index aace1aa..f0773f2 100644 --- a/dateutil/tzwin.py +++ b/dateutil/tzwin.py @@ -1,21 +1,9 @@ # This code was originally contributed by Jeffrey Harris. import datetime import struct -import platform import warnings - -running_on_windows = platform.platform().startswith('Windows') -if running_on_windows: - from six.moves import winreg - tzwin = _tzwin - tzwinlocal = _tzwinlocal -else: - def tzwin(*args): - warnings.warn('tzwin is implemented only on Windows') - return None - tzwinlocal = tzwin - +from six.moves import winreg __all__ = ["tzwin", "tzwinlocal"] @@ -27,7 +15,6 @@ TZLOCALKEYNAME = r"SYSTEM\CurrentControlSet\Control\TimeZoneInformation" def _settzkeyname(): - global TZKEYNAME handle = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) try: winreg.OpenKey(handle, TZKEYNAMENT).Close() @@ -35,9 +22,9 @@ def _settzkeyname(): except WindowsError: TZKEYNAME = TZKEYNAME9X handle.Close() + return TZKEYNAME -if running_on_windows: - _settzkeyname() +TZKEYNAME = _settzkeyname() class tzwinbase(datetime.tzinfo): """tzinfo class based on win32's timezones available in the registry.""" @@ -88,7 +75,7 @@ class tzwinbase(datetime.tzinfo): return not dstoff <= dt.replace(tzinfo=None) < dston -class _tzwin(tzwinbase): +class tzwin(tzwinbase): def __init__(self, name): self._name = name @@ -128,7 +115,7 @@ class _tzwin(tzwinbase): return (self.__class__, (self._name,)) -class _tzwinlocal(tzwinbase): +class tzwinlocal(tzwinbase): def __init__(self): |