rpms/pytz
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix patch

Browse Source
This commit is contained in:
Matěj Cepl 2016-07-21 08:22:41 +02:00
parent 40029e8aa9
commit e6a0d42125
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pytz-zoneinfo.patch
View File

@ -1,7 +1,7 @@
--- a/pytz/__init__.py --- a/pytz/__init__.py
+++ b/pytz/__init__.py +++ b/pytz/__init__.py
@@ -13,7 +13,7 @@ OLSON_VERSION = '2016d' @@ -13,7 +13,7 @@ OLSON_VERSION = '2016f'
VERSION = '2016.4' # Switching to pip compatible version numbering. VERSION = '2016.6.1' # Switching to pip compatible version numbering.
__version__ = VERSION __version__ = VERSION
-OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling -OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
@ -9,36 +9,36 @@
__all__ = [ __all__ = [
'timezone', 'utc', 'country_timezones', 'country_names', 'timezone', 'utc', 'country_timezones', 'country_names',
@@ -75,24 +75,19 @@ else: # Python 2.x @@ -77,23 +77,16 @@ def open_resource(name):
Uses the pkg_resources module if available and no standard file
found at the calculated location.
""" """
return s.encode('US-ASCII') + _tzinfo_dir = os.getenv("TZDIR") or "/usr/share/zoneinfo"
+ if _tzinfo_dir.endswith(os.sep):
+_tzinfo_dir = os.getenv("TZDIR") or "/usr/share/zoneinfo"
+if _tzinfo_dir.endswith(os.sep):
+ _tzinfo_dir = _tzinfo_dir[:-1] + _tzinfo_dir = _tzinfo_dir[:-1]
+
def open_resource(name):
"""Open a resource from the zoneinfo subdir for reading.
- Uses the pkg_resources module if available and no standard file
- found at the calculated location.
"""
name_parts = name.lstrip('/').split('/') name_parts = name.lstrip('/').split('/')
for part in name_parts: for part in name_parts:
if part == os.path.pardir or os.path.sep in part: if part == os.path.pardir or os.path.sep in part:
raise ValueError('Bad path segment: %r' % part) raise ValueError('Bad path segment: %r' % part)
- filename = os.path.join(os.path.dirname(__file__), - filename = os.path.join(os.path.dirname(__file__),
- 'zoneinfo', *name_parts) - 'zoneinfo', *name_parts)
- if not os.path.exists(filename) and resource_stream is not None: - if not os.path.exists(filename):
- # http://bugs.launchpad.net/bugs/383171 - we avoid using this - # http://bugs.launchpad.net/bugs/383171 - we avoid using this
- # unless absolutely necessary to help when a broken version of - # unless absolutely necessary to help when a broken version of
- # pkg_resources is installed. - # pkg_resources is installed.
- try:
- from pkg_resources import resource_stream
- except ImportError:
- resource_stream = None
- if resource_stream is not None:
- return resource_stream(__name__, 'zoneinfo/' + name) - return resource_stream(__name__, 'zoneinfo/' + name)
+ filename = os.path.join(_tzinfo_dir, *name_parts) + filename = os.path.join(_tzinfo_dir, *name_parts)
return open(filename, 'rb') return open(filename, 'rb')
@@ -487,1037 +482,38 @@ def _test(): @@ -490,1037 +483,38 @@ def _test():
if __name__ == '__main__': if __name__ == '__main__':
_test() _test()