From: Armin Ronacher Date: Sat, 6 Jul 2013 11:40:29 +0000 (+0200) Subject: Fixed win32 module for local time X-Git-Tag: 1.0~112 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97446245239a41b56fc32b07f8faed7050e6d737;p=thirdparty%2Fbabel.git Fixed win32 module for local time --- diff --git a/babel/localtime/_win32.py b/babel/localtime/_win32.py index 03f9e363..1636240e 100644 --- a/babel/localtime/_win32.py +++ b/babel/localtime/_win32.py @@ -1,12 +1,18 @@ try: import _winreg as winreg except ImportError: - import winreg + try: + import winreg + except ImportError: + winreg = None -from tzlocal.windows_tz import tz_names +from babel.core import get_global import pytz +tznames = get_global('windows_zone_mapping') + + def valuestodict(key): """Convert a registry key's values to a dictionary.""" dict = {}