[gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/files/

[Aaron Bauman]

commit:     944c3e7db7a6f739b1379c7ee7d68853929b2b70
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Mar 30 16:25:50 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu May 14 22:19:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944c3e7d

dev-python/pytz: remove unused patches

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-python/pytz/files/2016.6.1-zoneinfo.patch      | 12 --------
 .../pytz/files/pytz-2009h-zoneinfo-noinstall.patch | 32 ----------------------
 dev-python/pytz/files/pytz-2009j-zoneinfo.patch    | 14 ----------
 3 files changed, 58 deletions(-)

diff --git a/dev-python/pytz/files/2016.6.1-zoneinfo.patch b/dev-python/pytz/files/2016.6.1-zoneinfo.patch
deleted file mode 100644
index d8223da436c..00000000000
--- a/dev-python/pytz/files/2016.6.1-zoneinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pytz/__init__.py
-+++ b/pytz/__init__.py
-@@ -81,8 +81,7 @@
-     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)
-+    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
-     if not os.path.exists(filename):
-         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-         # unless absolutely necessary to help when a broken version of

diff --git a/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch b/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
deleted file mode 100644
index 2e970957988..00000000000
--- a/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e43745593e4627de8027587cb3b4a465c93fa0b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 19 Dec 2012 19:22:29 +0100
-Subject: [PATCH] Do not install zoneinfo files.
-
----
- setup.py | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index c8152d5..8f13279 100644
---- a/setup.py
-+++ b/setup.py
-@@ -13,15 +13,8 @@ me = 'Stuart Bishop'
- memail = 'stuart@stuartbishop.net'
- packages = ['pytz']
- resources = ['zone.tab', 'locales/pytz.pot']
--for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
--    # remove the 'pytz' part of the path
--    basepath = dirpath.split(os.path.sep, 1)[1]
--    resources.extend([os.path.join(basepath, filename)
--                     for filename in filenames])
- package_data = {'pytz': resources}
- 
--assert len(resources) > 10, 'zoneinfo files not found!'
--
- setup (
-     name='pytz',
-     version=pytz.VERSION,
--- 
-1.8.0.2
-

diff --git a/dev-python/pytz/files/pytz-2009j-zoneinfo.patch b/dev-python/pytz/files/pytz-2009j-zoneinfo.patch
deleted file mode 100644
index ee05d9f5efa..00000000000
--- a/dev-python/pytz/files/pytz-2009j-zoneinfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use the system zoneinfo from sys-libs/timezone-data.
-
---- pytz/__init__.py
-+++ pytz/__init__.py
-@@ -54,8 +54,7 @@
-     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)
-+    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
-     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

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytz/files/

[Michał Górny]

commit:     895f647b3b4e748fac730036d6e9067f327bcadf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 16:30:24 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 16:30:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=895f647b

dev-python/pytz: Rename our allzones() to private _allzones()

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch b/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
index 4ce04416dc83..1e64f1bd2fa4 100644
--- a/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
+++ b/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
@@ -1,6 +1,8 @@
 Inspired by the Fedora patch:
 https://src.fedoraproject.org/rpms/pytz/blob/rawhide/f/pytz-zoneinfo.patch
 
+_allzones() is based on code in gen_tzinfo.py in upstream repo.
+
 diff --git a/pytz/__init__.py b/pytz/__init__.py
 index f89d0eb..d00f3bb 100644
 --- a/pytz/__init__.py
@@ -9,7 +11,7 @@ index f89d0eb..d00f3bb 100644
          return s.encode('ASCII')
  
  
-+def allzones():
++def _allzones():
 +    for dirpath, dirnames, filenames in os.walk(_PYTZ_TZDATADIR):
 +        for f in filenames:
 +            p = os.path.join(dirpath, f)
@@ -18,7 +20,7 @@ index f89d0eb..d00f3bb 100644
 +
 +
 +_PYTZ_TZDATADIR = os.environ.get('PYTZ_TZDATADIR', '/usr/share/zoneinfo')
-+_all_timezones_unchecked = LazyList(x for x in allzones())
++_all_timezones_unchecked = LazyList(x for x in _allzones())
 +all_timezones = _all_timezones_unchecked
 +all_timezones_set = LazySet(all_timezones)
 +