32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
|
--- pytz/tzfile.py.old 2008-11-11 08:30:45.000000000 -0900
|
||
|
|
+++ pytz/tzfile.py 2008-11-11 08:31:02.000000000 -0900
|
||
|
|
@@ -103,7 +103,7 @@
|
||
|
|
if __name__ == '__main__':
|
||
|
|
import os.path
|
||
|
|
from pprint import pprint
|
||
|
|
- base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
|
||
|
|
+ base = os.path.join(os.path.dirname(__file__), '/usr/share/zoneinfo')
|
||
|
|
tz = build_tzinfo('Australia/Melbourne',
|
||
|
|
open(os.path.join(base,'Australia','Melbourne'), 'rb'))
|
||
|
|
tz = build_tzinfo('US/Eastern',
|
||
|
|
|
||
|
|
--- pytz/__init__.py.old 2008-11-11 08:30:05.000000000 -0900
|
||
|
|
+++ pytz/__init__.py 2008-11-11 08:30:31.000000000 -0900
|
||
|
|
@@ -50,14 +50,14 @@
|
||
|
|
Uses the pkg_resources module if available.
|
||
|
|
"""
|
||
|
|
if resource_stream is not None:
|
||
|
|
- return resource_stream(__name__, 'zoneinfo/' + name)
|
||
|
|
+ return resource_stream(__name__, '/usr/share/zoneinfo/' + name)
|
||
|
|
else:
|
||
|
|
name_parts = name.lstrip('/').split('/')
|
||
|
|
for part in name_parts:
|
||
|
|
if part == os.path.pardir or os.path.sep in part:
|
||
|
|
raise ValueError('Bad path segment: %r' % part)
|
||
|
|
filename = os.path.join(os.path.dirname(__file__),
|
||
|
|
- 'zoneinfo', *name_parts)
|
||
|
|
+ '/usr/share/zoneinfo', *name_parts)
|
||
|
|
return open(filename, 'rb')
|
||
|
|
|
||
|
|
|