Even more fixing of the patch

pytz-zoneinfo.patch

@@ -1,5 +1,14 @@
 --- a/pytz/__init__.py
 +++ b/pytz/__init__.py
+@@ -13,7 +13,7 @@ OLSON_VERSION = '2016d'
+ VERSION = '2016.4'  # Switching to pip compatible version numbering.
+ __version__ = VERSION
+ 
+-OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
++OLSEN_VERSION = OLSON_VERSION  # Old releases had this misspelling
+ 
+ __all__ = [
+     'timezone', 'utc', 'country_timezones', 'country_names',
 @@ -75,24 +75,19 @@ else: # Python 2.x
          """
          return s.encode('US-ASCII')
@@ -622,9 +631,6 @@
 - 'W-SU',
 - 'WET',
 - 'Zulu']
--all_timezones = LazyList(
--        tz for tz in all_timezones if resource_exists(tz))
--        
 +all_timezones = []
 +for root, dirs, files in os.walk(_tzinfo_dir):
 +    for exclude in 'posix', 'right':
@@ -637,8 +643,9 @@
 +                         and '.' not in tz_file)
 +
 +
-+ all_timezones = LazyList(
-+         tz for tz in all_timezones if resource_exists(tz))
+ all_timezones = LazyList(
+         tz for tz in all_timezones if resource_exists(tz))
+-        
 +
  all_timezones_set = LazySet(all_timezones)
 -common_timezones = \