r2355 - in python-tz/trunk/debian (changelog patches/tzdata)

[menesis-guest at users.alioth.debian.org]

    Date: Tuesday, August 23, 2011 @ 16:46:38
  Author: menesis-guest
Revision: 2355

debian/patches/tzdata: also remove import of pkg_resources (Closes: #599047)

Modified:
  python-tz/trunk/debian/changelog
  python-tz/trunk/debian/patches/tzdata

Modified: python-tz/trunk/debian/changelog
===================================================================
--- python-tz/trunk/debian/changelog	2011-08-23 15:30:50 UTC (rev 2354)
+++ python-tz/trunk/debian/changelog	2011-08-23 16:46:38 UTC (rev 2355)
@@ -3,6 +3,7 @@
   * Switch to dh_python2 (Closes: #617041):
   * Switch to source format 3.0 (quilt)
   * debian/control: build-depend on python-all (not -dev).
+  * debian/patches/tzdata: also remove import of pkg_resources (Closes: #599047)
 
  -- Gediminas Paulauskas <menesis at pov.lt>  Tue, 23 Aug 2011 18:14:25 +0300
 

Modified: python-tz/trunk/debian/patches/tzdata
===================================================================
--- python-tz/trunk/debian/patches/tzdata	2011-08-23 15:30:50 UTC (rev 2354)
+++ python-tz/trunk/debian/patches/tzdata	2011-08-23 16:46:38 UTC (rev 2355)
@@ -1,6 +1,20 @@
---- pytz-2010b/pytz/__init__.py	2010-01-26 08:10:01.000000000 +0100
-+++ ../trunk/pytz/__init__.py	2010-01-27 18:34:17.000000000 +0100
-@@ -50,17 +50,12 @@
+Index: python-tz/pytz/__init__.py
+===================================================================
+--- python-tz.orig/pytz/__init__.py
++++ python-tz/pytz/__init__.py
+@@ -28,11 +28,6 @@ __all__ = [
+ import sys, datetime, os.path, gettext
+ from UserDict import DictMixin
+ 
+-try:
+-    from pkg_resources import resource_stream
+-except ImportError:
+-    resource_stream = None
+-
+ from tzinfo import AmbiguousTimeError, InvalidTimeError, NonExistentTimeError
+ from tzinfo import unpickler
+ from tzfile import build_tzinfo
+@@ -50,17 +45,12 @@ def open_resource(name):
      Uses the pkg_resources module if available and no standard file
      found at the calculated location.
      """