1
--- pytz-2010b/pytz/__init__.py 2010-01-26 08:10:01.000000000 +0100
2
+++ ../trunk/pytz/__init__.py 2010-01-27 18:34:17.000000000 +0100
1
Index: python-tz/pytz/__init__.py
2
===================================================================
3
--- python-tz.orig/pytz/__init__.py
4
+++ python-tz/pytz/__init__.py
5
@@ -28,11 +28,6 @@ __all__ = [
6
import sys, datetime, os.path, gettext
7
from UserDict import DictMixin
10
- from pkg_resources import resource_stream
12
- resource_stream = None
14
from tzinfo import AmbiguousTimeError, InvalidTimeError, NonExistentTimeError
15
from tzinfo import unpickler
16
from tzfile import build_tzinfo
17
@@ -50,17 +45,12 @@ def open_resource(name):
4
18
Uses the pkg_resources module if available and no standard file
5
19
found at the calculated location.
7
+ # Patched in Debian, use the system zoninfo from the tzdata package
21
+ # Patched in Debian, use the system zoneinfo from the tzdata package
8
22
name_parts = name.lstrip('/').split('/')
9
23
for part in name_parts:
10
24
if part == os.path.pardir or os.path.sep in part: