components/python/pytz/patches/zoneinfopath.patch
changeset 3998 5bd484384122
parent 1555 85cc81ad9166
--- a/components/python/pytz/patches/zoneinfopath.patch	Fri Mar 20 03:13:26 2015 -0700
+++ b/components/python/pytz/patches/zoneinfopath.patch	Thu Mar 19 14:41:20 2015 -0700
@@ -3,9 +3,9 @@
 point at that copy.  The extra table files are in different places between
 the two, so we adjust those paths as well.
 
---- pytz-2013d/pytz/__init__.py	Thu Sep  5 06:42:03 2013
-+++ pytz-2013d/pytz/__init__.py	Tue Oct 22 15:10:47 2013
-@@ -88,8 +88,7 @@
+--- pytz-2014.10/pytz/__init__.py.~1~	2014-11-27 01:00:22.000000000 -0800
++++ pytz-2014.10/pytz/__init__.py	2015-02-25 11:05:04.867482331 -0800
+@@ -86,8 +86,7 @@ def open_resource(name):
      for part in name_parts:
          if part == os.path.pardir or os.path.sep in part:
              raise ValueError('Bad path segment: %r' % part)
@@ -15,7 +15,7 @@
      if not os.path.exists(filename) and resource_stream is not None:
          # http://bugs.launchpad.net/bugs/383171 - we avoid using this
          # unless absolutely necessary to help when a broken version of
-@@ -328,7 +327,7 @@
+@@ -326,13 +325,15 @@ class _CountryTimezoneDict(LazyDict):
  
      def _fill(self):
          data = {}
@@ -24,7 +24,6 @@
          try:
              for line in zone_tab:
                  line = line.decode('US-ASCII')
-@@ -335,6 +334,8 @@
                  if line.startswith('#'):
                      continue
                  code, coordinates, zone = line.split(None, 4)[:3]
@@ -33,7 +32,7 @@
                  if zone not in all_timezones_set:
                      continue
                  try:
-@@ -356,7 +357,7 @@
+@@ -354,13 +355,15 @@ class _CountryNameDict(LazyDict):
      '''
      def _fill(self):
          data = {}
@@ -42,7 +41,6 @@
          try:
              for line in zone_tab.readlines():
                  line = line.decode('US-ASCII')
-@@ -363,6 +364,8 @@
                  if line.startswith('#'):
                      continue
                  code, name = line.split(None, 1)