Date: Sun, 27 Aug 2023 11:32:10 GMT From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 38d36e52f825 - main - zope ports: remove leaf zope ports that have no sense in absence of zope itself Message-ID: <202308271132.37RBWArT094539@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rm: URL: https://cgit.FreeBSD.org/ports/commit/?id=38d36e52f825a4e943762e4453ec1ebea13a10c7 commit 38d36e52f825a4e943762e4453ec1ebea13a10c7 Author: Ruslan Makhmatkhanov <rm@FreeBSD.org> AuthorDate: 2023-08-27 11:31:13 +0000 Commit: Ruslan Makhmatkhanov <rm@FreeBSD.org> CommitDate: 2023-08-27 11:31:13 +0000 zope ports: remove leaf zope ports that have no sense in absence of zope itself With hat: zope --- MOVED | 10 + devel/Makefile | 10 - devel/py-five.globalrequest/Makefile | 20 - devel/py-five.globalrequest/distinfo | 2 - devel/py-five.globalrequest/pkg-descr | 1 - devel/py-zope.browser/Makefile | 20 - devel/py-zope.browser/distinfo | 2 - devel/py-zope.browser/pkg-descr | 1 - devel/py-zope.contenttype/Makefile | 20 - devel/py-zope.contenttype/distinfo | 2 - devel/py-zope.contenttype/files/patch-2to3 | 31 - devel/py-zope.contenttype/pkg-descr | 1 - devel/py-zope.exceptions/Makefile | 22 - devel/py-zope.exceptions/distinfo | 2 - devel/py-zope.exceptions/pkg-descr | 3 - devel/py-zope.globalrequest/Makefile | 21 - devel/py-zope.globalrequest/distinfo | 2 - devel/py-zope.globalrequest/pkg-descr | 1 - devel/py-zope.i18n/Makefile | 27 - devel/py-zope.i18n/distinfo | 2 - devel/py-zope.i18n/files/patch-2to3 | 529 ---------- devel/py-zope.i18n/pkg-descr | 5 - devel/py-zope.location/Makefile | 25 - devel/py-zope.location/distinfo | 2 - devel/py-zope.location/pkg-descr | 1 - devel/py-zope.publisher/Makefile | 32 - devel/py-zope.publisher/distinfo | 2 - devel/py-zope.publisher/files/patch-2to3 | 1513 ---------------------------- devel/py-zope.publisher/pkg-descr | 6 - devel/py-zope.testing/Makefile | 23 - devel/py-zope.testing/distinfo | 2 - devel/py-zope.testing/files/patch-2to3 | 145 --- devel/py-zope.testing/pkg-descr | 3 - devel/py-zope.traversing/Makefile | 28 - devel/py-zope.traversing/distinfo | 2 - devel/py-zope.traversing/pkg-descr | 2 - 36 files changed, 10 insertions(+), 2510 deletions(-) diff --git a/MOVED b/MOVED index 548523f50966..2d9b99416f46 100644 --- a/MOVED +++ b/MOVED @@ -7823,3 +7823,13 @@ devel/py-zope.processlifetime||2023-08-27|Remove leaf zope ports that have no se devel/py-zope.sequencesort||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself devel/py-zope.size||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself devel/py-zope.tales||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-five.globalrequest||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-zope.globalrequest||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-zope.traversing||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-zope.publisher||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-zope.browser||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-zope.contenttype||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-zope.testing||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-zope.exceptions||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself +devel/py-zope.i18n||2023-08-27|Remove leaf zope ports that have no sencse in absence of zope itself +devel/py-zope.location||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself diff --git a/devel/Makefile b/devel/Makefile index 4b33775dd6d5..d0c5897448aa 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4655,7 +4655,6 @@ SUBDIR += py-findlibs SUBDIR += py-findpython SUBDIR += py-first - SUBDIR += py-five.globalrequest SUBDIR += py-fixtures SUBDIR += py-flake8 SUBDIR += py-flake8-black @@ -5841,22 +5840,13 @@ SUBDIR += py-zfp SUBDIR += py-zict SUBDIR += py-zipp - SUBDIR += py-zope.browser SUBDIR += py-zope.component SUBDIR += py-zope.configuration - SUBDIR += py-zope.contenttype SUBDIR += py-zope.deprecation SUBDIR += py-zope.event - SUBDIR += py-zope.exceptions - SUBDIR += py-zope.globalrequest - SUBDIR += py-zope.i18n SUBDIR += py-zope.interface - SUBDIR += py-zope.location - SUBDIR += py-zope.publisher SUBDIR += py-zope.schema SUBDIR += py-zope.testbrowser - SUBDIR += py-zope.testing - SUBDIR += py-zope.traversing SUBDIR += py3c SUBDIR += pybind11 SUBDIR += pybind11-json diff --git a/devel/py-five.globalrequest/Makefile b/devel/py-five.globalrequest/Makefile deleted file mode 100644 index 6d4224d3247d..000000000000 --- a/devel/py-five.globalrequest/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME= five.globalrequest -PORTVERSION= 1.0 -PORTREVISION= 1 -CATEGORIES= devel python zope -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DIST_SUBDIR= zope - -MAINTAINER= zope@FreeBSD.org -COMMENT= Zope 2 integration for zope.globalrequest -WWW= https://pypi.org/project/five.globalrequest/ - -LICENSE= ZPL21 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest@${PY_FLAVOR} - -USES= python -USE_PYTHON= distutils autoplist - -.include <bsd.port.mk> diff --git a/devel/py-five.globalrequest/distinfo b/devel/py-five.globalrequest/distinfo deleted file mode 100644 index 0a9199c47348..000000000000 --- a/devel/py-five.globalrequest/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (zope/five.globalrequest-1.0.tar.gz) = f861e68e0c2397ab84091263753964159fde7e89d19e667a632ac0e625eb5346 -SIZE (zope/five.globalrequest-1.0.tar.gz) = 2718 diff --git a/devel/py-five.globalrequest/pkg-descr b/devel/py-five.globalrequest/pkg-descr deleted file mode 100644 index badb560f7a99..000000000000 --- a/devel/py-five.globalrequest/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Zope 2 integration for zope.globalrequest. diff --git a/devel/py-zope.browser/Makefile b/devel/py-zope.browser/Makefile deleted file mode 100644 index 9d5bddce4ea9..000000000000 --- a/devel/py-zope.browser/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME= zope.browser -PORTVERSION= 2.1.0 -CATEGORIES= devel python zope -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DIST_SUBDIR= zope - -MAINTAINER= zope@FreeBSD.org -COMMENT= Shared Zope Toolkit browser components -WWW= https://pypi.org/project/zope.browser/ - -LICENSE= ZPL21 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} - -NO_ARCH= yes -USES= python -USE_PYTHON= autoplist distutils - -.include <bsd.port.mk> diff --git a/devel/py-zope.browser/distinfo b/devel/py-zope.browser/distinfo deleted file mode 100644 index d226a92218ef..000000000000 --- a/devel/py-zope.browser/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (zope/zope.browser-2.1.0.tar.gz) = 6f50384c01b400d985642a32b341c19090c32bc8ba0d07d88da96bc9b20a5da2 -SIZE (zope/zope.browser-2.1.0.tar.gz) = 8453 diff --git a/devel/py-zope.browser/pkg-descr b/devel/py-zope.browser/pkg-descr deleted file mode 100644 index ebde86658157..000000000000 --- a/devel/py-zope.browser/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package provides shared browser components for the Zope Toolkit. diff --git a/devel/py-zope.contenttype/Makefile b/devel/py-zope.contenttype/Makefile deleted file mode 100644 index 4822388053f8..000000000000 --- a/devel/py-zope.contenttype/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME= zope.contenttype -PORTVERSION= 3.5.5 -PORTREVISION= 1 -CATEGORIES= devel python zope -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DIST_SUBDIR= zope - -MAINTAINER= zope@FreeBSD.org -COMMENT= Zope contenttype -WWW= https://pypi.org/project/zope.contenttype/ - -LICENSE= ZPL21 - -USES= python zip -USE_PYTHON= distutils autoplist - -NO_ARCH= yes - -.include <bsd.port.mk> diff --git a/devel/py-zope.contenttype/distinfo b/devel/py-zope.contenttype/distinfo deleted file mode 100644 index 97e0848bd01c..000000000000 --- a/devel/py-zope.contenttype/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (zope/zope.contenttype-3.5.5.zip) = 4ccb6f0952ac533a70f11521dbc2df34164fb00ecab746130a625de7cc9b47f7 -SIZE (zope/zope.contenttype-3.5.5.zip) = 20397 diff --git a/devel/py-zope.contenttype/files/patch-2to3 b/devel/py-zope.contenttype/files/patch-2to3 deleted file mode 100644 index 490d88cb1cf2..000000000000 --- a/devel/py-zope.contenttype/files/patch-2to3 +++ /dev/null @@ -1,31 +0,0 @@ ---- src/zope/contenttype/__init__.py.orig 2011-07-27 03:41:00 UTC -+++ src/zope/contenttype/__init__.py -@@ -106,6 +106,6 @@ here = os.path.dirname(os.path.abspath(__file__)) - add_files([os.path.join(here, "mime.types")]) - - if __name__ == '__main__': -- items = mimetypes.types_map.items() -+ items = list(mimetypes.types_map.items()) - items.sort() -- for item in items: print "%s:\t%s" % item -+ for item in items: print("%s:\t%s" % item) ---- src/zope/contenttype/parse.py.orig 2010-04-05 21:04:38 UTC -+++ src/zope/contenttype/parse.py -@@ -112,14 +112,15 @@ def _unescape(string): - return string - - --def join((major, minor, params)): -+def join(xxx_todo_changeme): -+ (major, minor, params) = xxx_todo_changeme - pstr = "" - try: - params.items - except AttributeError: - pass - else: -- params = params.items() -+ params = list(params.items()) - # ensure a predictable order: - params.sort() - for name, value in params: diff --git a/devel/py-zope.contenttype/pkg-descr b/devel/py-zope.contenttype/pkg-descr deleted file mode 100644 index 32fa8b71742d..000000000000 --- a/devel/py-zope.contenttype/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -zope.contenttype is a utility module for content-type handling. diff --git a/devel/py-zope.exceptions/Makefile b/devel/py-zope.exceptions/Makefile deleted file mode 100644 index 13d55556cfe9..000000000000 --- a/devel/py-zope.exceptions/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -PORTNAME= zope.exceptions -PORTVERSION= 4.0.0.1 -PORTREVISION= 1 -CATEGORIES= devel python -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DIST_SUBDIR= zope - -MAINTAINER= zope@FreeBSD.org -COMMENT= General Zope Exceptions -WWW= https://pypi.org/project/zope.exceptions/ - -LICENSE= ZPL21 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} - -USES= python -USE_PYTHON= distutils autoplist - -NO_ARCH= yes - -.include <bsd.port.mk> diff --git a/devel/py-zope.exceptions/distinfo b/devel/py-zope.exceptions/distinfo deleted file mode 100644 index d5074b176fb1..000000000000 --- a/devel/py-zope.exceptions/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (zope/zope.exceptions-4.0.0.1.tar.gz) = 6d86069fe18ef9671c2e68673f5a3ad2c46cd85d703f3abba3cb2e8d544beaa6 -SIZE (zope/zope.exceptions-4.0.0.1.tar.gz) = 21557 diff --git a/devel/py-zope.exceptions/pkg-descr b/devel/py-zope.exceptions/pkg-descr deleted file mode 100644 index da4f041fb973..000000000000 --- a/devel/py-zope.exceptions/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -zope.exceptions contains exception interfaces and implementations -which are so general purpose that they don't belong in Zope -application-specific packages. diff --git a/devel/py-zope.globalrequest/Makefile b/devel/py-zope.globalrequest/Makefile deleted file mode 100644 index 66620c024efe..000000000000 --- a/devel/py-zope.globalrequest/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -PORTNAME= zope.globalrequest -PORTVERSION= 1.1 -CATEGORIES= devel python zope -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DIST_SUBDIR= zope - -MAINTAINER= zope@FreeBSD.org -COMMENT= Global way of retrieving the currently active request -WWW= https://pypi.org/project/zope.globalrequest/ - -LICENSE= ZPL21 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${PY_FLAVOR} - -USES= python -USE_PYTHON= autoplist distutils - -.include <bsd.port.mk> diff --git a/devel/py-zope.globalrequest/distinfo b/devel/py-zope.globalrequest/distinfo deleted file mode 100644 index 3489eff510c4..000000000000 --- a/devel/py-zope.globalrequest/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (zope/zope.globalrequest-1.1.tar.gz) = 19089d97dfe7ee5d5367ef30075783e74e4870dd86c28c50ecd26b1876b509ed -SIZE (zope/zope.globalrequest-1.1.tar.gz) = 5331 diff --git a/devel/py-zope.globalrequest/pkg-descr b/devel/py-zope.globalrequest/pkg-descr deleted file mode 100644 index a84a5c05bb3f..000000000000 --- a/devel/py-zope.globalrequest/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Global way of retrieving the currently active request. diff --git a/devel/py-zope.i18n/Makefile b/devel/py-zope.i18n/Makefile deleted file mode 100644 index e5d15b4075de..000000000000 --- a/devel/py-zope.i18n/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -PORTNAME= zope.i18n -PORTVERSION= 3.8.0 -PORTREVISION= 1 -CATEGORIES= devel www python -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DIST_SUBDIR= zope - -MAINTAINER= zope@FreeBSD.org -COMMENT= Zope Internationalization Support -WWW= https://pypi.org/project/zope.i18n/ - -LICENSE= ZPL21 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} - -USES= gettext python -USE_PYTHON= autoplist distutils -NO_ARCH= yes - -.include <bsd.port.mk> diff --git a/devel/py-zope.i18n/distinfo b/devel/py-zope.i18n/distinfo deleted file mode 100644 index 88ebfe880f86..000000000000 --- a/devel/py-zope.i18n/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (zope/zope.i18n-3.8.0.tar.gz) = 753a087ca9d2df6965e787be823bfc9f1b9d3d6aa27a1f0e662b425d6bb4b610 -SIZE (zope/zope.i18n-3.8.0.tar.gz) = 613058 diff --git a/devel/py-zope.i18n/files/patch-2to3 b/devel/py-zope.i18n/files/patch-2to3 deleted file mode 100644 index 7764ca1fd65b..000000000000 --- a/devel/py-zope.i18n/files/patch-2to3 +++ /dev/null @@ -1,529 +0,0 @@ ---- src/zope/i18n/format.py.orig 2012-03-15 13:58:09 UTC -+++ src/zope/i18n/format.py -@@ -86,7 +86,7 @@ class DateTimeFormat(object): - - # Map the parsing results to a datetime object - ordered = [None, None, None, None, None, None, None] -- bin_pattern = filter(lambda x: isinstance(x, tuple), bin_pattern) -+ bin_pattern = [x for x in bin_pattern if isinstance(x, tuple)] - - # Handle years; note that only 'yy' and 'yyyy' are allowed - if ('y', 2) in bin_pattern: -@@ -124,7 +124,7 @@ class DateTimeFormat(object): - - # Shortcut for the simple int functions - dt_fields_map = {'d': 2, 'H': 3, 'm': 4, 's': 5, 'S': 6} -- for field in dt_fields_map.keys(): -+ for field in list(dt_fields_map.keys()): - entry = _findFormattingCharacterInPattern(field, bin_pattern) - if not entry: continue - pos = dt_fields_map[field] -@@ -186,7 +186,7 @@ class DateTimeFormat(object): - else: - bin_pattern = self._bin_pattern - -- text = u'' -+ text = '' - info = buildDateTimeInfo(obj, self.calendar, bin_pattern) - for elem in bin_pattern: - text += info.get(elem, elem) -@@ -209,18 +209,18 @@ class NumberFormat(object): - def __init__(self, pattern=None, symbols={}): - # setup default symbols - self.symbols = { -- u'decimal': u'.', -- u'group': u',', -- u'list': u';', -- u'percentSign': u'%', -- u'nativeZeroDigit': u'0', -- u'patternDigit': u'#', -- u'plusSign': u'+', -- u'minusSign': u'-', -- u'exponential': u'E', -- u'perMille': u'\xe2\x88\x9e', -- u'infinity': u'\xef\xbf\xbd', -- u'nan': '' } -+ 'decimal': '.', -+ 'group': ',', -+ 'list': ';', -+ 'percentSign': '%', -+ 'nativeZeroDigit': '0', -+ 'patternDigit': '#', -+ 'plusSign': '+', -+ 'minusSign': '-', -+ 'exponential': 'E', -+ 'perMille': '\xe2\x88\x9e', -+ 'infinity': '\xef\xbf\xbd', -+ 'nan': '' } - self.symbols.update(symbols) - self._pattern = pattern - self._bin_pattern = None -@@ -360,7 +360,7 @@ class NumberFormat(object): - # The exponential might have a mandatory sign; remove it from the - # bin_pattern and remember the setting - exp_bin_pattern = bin_pattern[EXPONENTIAL] -- plus_sign = u'' -+ plus_sign = '' - if exp_bin_pattern.startswith('+'): - plus_sign = self.symbols['plusSign'] - exp_bin_pattern = exp_bin_pattern[1:] -@@ -444,7 +444,7 @@ class NumberFormat(object): - text += bin_pattern[PADDING4]*post_padding - - # TODO: Need to make sure unicode is everywhere -- return unicode(text) -+ return str(text) - - - -@@ -599,7 +599,7 @@ def buildDateTimeInfo(dt, calendar, pattern): - """Create the bits and pieces of the datetime object that can be put - together.""" - if isinstance(dt, datetime.time): -- dt = datetime.datetime(1969, 01, 01, dt.hour, dt.minute, dt.second, -+ dt = datetime.datetime(1969, 0o1, 0o1, dt.hour, dt.minute, dt.second, - dt.microsecond) - elif (isinstance(dt, datetime.date) and - not isinstance(dt, datetime.datetime)): -@@ -631,8 +631,8 @@ def buildDateTimeInfo(dt, calendar, pattern): - tz_name = tzinfo.tzname(dt) or tz_defaultname - tz_fullname = getattr(tzinfo, 'zone', None) or tz_name - -- info = {('y', 2): unicode(dt.year)[2:], -- ('y', 4): unicode(dt.year), -+ info = {('y', 2): str(dt.year)[2:], -+ ('y', 4): str(dt.year), - } - - # Generic Numbers -@@ -643,7 +643,7 @@ def buildDateTimeInfo(dt, calendar, pattern): - ('S', dt.microsecond), ('w', int(dt.strftime('%W'))), - ('W', week_in_month)): - for entry in _findFormattingCharacterInPattern(field, pattern): -- info[entry] = (u'%%.%ii' %entry[1]) %value -+ info[entry] = ('%%.%ii' %entry[1]) %value - - # am/pm marker (Text) - for entry in _findFormattingCharacterInPattern('a', pattern): -@@ -657,9 +657,9 @@ def buildDateTimeInfo(dt, calendar, pattern): - # time zone (Text) - for entry in _findFormattingCharacterInPattern('z', pattern): - if entry[1] == 1: -- info[entry] = u"%s%i%.2i" %(tz_sign, tz_hours, tz_mins) -+ info[entry] = "%s%i%.2i" %(tz_sign, tz_hours, tz_mins) - elif entry[1] == 2: -- info[entry] = u"%s%.2i:%.2i" %(tz_sign, tz_hours, tz_mins) -+ info[entry] = "%s%.2i:%.2i" %(tz_sign, tz_hours, tz_mins) - elif entry[1] == 3: - info[entry] = tz_name - else: -@@ -668,9 +668,9 @@ def buildDateTimeInfo(dt, calendar, pattern): - # month in year (Text and Number) - for entry in _findFormattingCharacterInPattern('M', pattern): - if entry[1] == 1: -- info[entry] = u'%i' %dt.month -+ info[entry] = '%i' %dt.month - elif entry[1] == 2: -- info[entry] = u'%.2i' %dt.month -+ info[entry] = '%.2i' %dt.month - elif entry[1] == 3: - info[entry] = calendar.months[dt.month][1] - else: -@@ -679,9 +679,9 @@ def buildDateTimeInfo(dt, calendar, pattern): - # day in week (Text and Number) - for entry in _findFormattingCharacterInPattern('E', pattern): - if entry[1] == 1: -- info[entry] = u'%i' %weekday -+ info[entry] = '%i' %weekday - elif entry[1] == 2: -- info[entry] = u'%.2i' %weekday -+ info[entry] = '%.2i' %weekday - elif entry[1] == 3: - info[entry] = calendar.days[dt.weekday() + 1][1] - else: ---- src/zope/i18n/locales/tests/test_locales.py.orig 2012-03-15 13:58:06 UTC -+++ src/zope/i18n/locales/tests/test_locales.py -@@ -35,7 +35,7 @@ class TestILocaleProvider(TestCase): - self.locales = self._makeNewProvider() - - def testInterfaceConformity(self): -- self.assert_(ILocaleProvider.providedBy(self.locales)) -+ self.assertTrue(ILocaleProvider.providedBy(self.locales)) - - def test_getLocale(self): - locale = self.locales.getLocale(None, None, None) -@@ -66,10 +66,10 @@ class TestLocaleProvider(TestILocaleProvider): - - def test_loadLocale(self): - self.locales.loadLocale(None, None, None) -- self.assertEqual(self.locales._locales.keys(), [(None, None, None)]) -+ self.assertEqual(list(self.locales._locales.keys()), [(None, None, None)]) - - self.locales.loadLocale('en', None, None) -- self.assert_(('en', None, None) in self.locales._locales.keys()) -+ self.assertTrue(('en', None, None) in list(self.locales._locales.keys())) - - def test_loadLocaleFailure(self): - self.assertRaises(LoadLocaleError, self.locales.loadLocale, 'zzz') -@@ -97,19 +97,19 @@ class TestLocaleAndProvider(TestCase): - def test_getDateFormatter(self): - formatter = self.locale.dates.getFormatter('date', 'medium') - self.assertEqual(formatter.getPattern(), 'MMM d, yyyy') -- self.assertEqual(formatter.format(datetime.date(2003, 01, 02)), -+ self.assertEqual(formatter.format(datetime.date(2003, 0o1, 0o2)), - 'Jan 2, 2003') - self.assertEqual(formatter.parse('Jan 2, 2003'), -- datetime.date(2003, 01, 02)) -+ datetime.date(2003, 0o1, 0o2)) - - def test_getDateTimeFormatter(self): - formatter = self.locale.dates.getFormatter('dateTime', 'medium') - self.assertEqual(formatter.getPattern(), 'MMM d, yyyy h:mm:ss a') - self.assertEqual( -- formatter.format(datetime.datetime(2003, 01, 02, 12, 30)), -+ formatter.format(datetime.datetime(2003, 0o1, 0o2, 12, 30)), - 'Jan 2, 2003 12:30:00 PM') - self.assertEqual(formatter.parse('Jan 2, 2003 12:30:00 PM'), -- datetime.datetime(2003, 01, 02, 12, 30)) -+ datetime.datetime(2003, 0o1, 0o2, 12, 30)) - - def test_getNumberFormatter(self): - formatter = self.locale.numbers.getFormatter('decimal') -@@ -124,13 +124,13 @@ class TestGlobalLocaleProvider(TestCase): - - def testLoading(self): - locales.loadLocale(None, None, None) -- self.assert_(locales._locales.has_key((None, None, None))) -+ self.assertTrue((None, None, None) in locales._locales) - locales.loadLocale('en', None, None) -- self.assert_(locales._locales.has_key(('en', None, None))) -+ self.assertTrue(('en', None, None) in locales._locales) - locales.loadLocale('en', 'US', None) -- self.assert_(locales._locales.has_key(('en', 'US', None))) -+ self.assertTrue(('en', 'US', None) in locales._locales) - locales.loadLocale('en', 'US', 'POSIX') -- self.assert_(locales._locales.has_key(('en', 'US', 'POSIX'))) -+ self.assertTrue(('en', 'US', 'POSIX') in locales._locales) - - def test_getLocale(self): - locale = locales.getLocale('en', 'GB') ---- src/zope/i18n/tests/test_formats.py.orig 2012-03-15 13:58:09 UTC -+++ src/zope/i18n/tests/test_formats.py -@@ -34,7 +34,7 @@ class LocaleStub(object): - - class LocaleCalendarStub(object): - -- type = u'gregorian' -+ type = 'gregorian' - - months = { 1: ('Januar', 'Jan'), 2: ('Februar', 'Feb'), - 3: ('Maerz', 'Mrz'), 4: ('April', 'Apr'), -@@ -59,7 +59,7 @@ class LocaleCalendarStub(object): - return [self.months.get(type, (None, None))[0] for type in range(1, 13)] - - def getMonthTypeFromName(self, name): -- for item in self.months.items(): -+ for item in list(self.months.items()): - if item[1][0] == name: - return item[0] - -@@ -67,7 +67,7 @@ class LocaleCalendarStub(object): - return [self.months.get(type, (None, None))[1] for type in range(1, 13)] - - def getMonthTypeFromAbbreviation(self, abbr): -- for item in self.months.items(): -+ for item in list(self.months.items()): - if item[1][1] == abbr: - return item[0] - -@@ -75,7 +75,7 @@ class LocaleCalendarStub(object): - return [self.days.get(type, (None, None))[0] for type in range(1, 8)] - - def getDayTypeFromName(self, name): -- for item in self.days.items(): -+ for item in list(self.days.items()): - if item[1][0] == name: - return item[0] - -@@ -83,7 +83,7 @@ class LocaleCalendarStub(object): - return [self.days.get(type, (None, None))[1] for type in range(1, 8)] - - def getDayTypeFromAbbreviation(self, abbr): -- for item in self.days.items(): -+ for item in list(self.days.items()): - if item[1][1] == abbr: - return item[0] - -@@ -171,14 +171,14 @@ class TestDateTimePatternParser(TestCase): - # Quote not closed - try: - parseDateTimePattern("HH' Uhr") -- except DateTimePatternParseError, err: -+ except DateTimePatternParseError as err: - self.assertEqual( - str(err), 'The quote starting at character 2 is not closed.') - # Test correct length of characters in datetime fields - try: - parseDateTimePattern("HHHHH") -- except DateTimePatternParseError, err: -- self.assert_(str(err).endswith('You have: 5')) -+ except DateTimePatternParseError as err: -+ self.assertTrue(str(err).endswith('You have: 5')) - - - class TestBuildDateTimeParseInfo(TestCase): -@@ -222,9 +222,9 @@ class TestBuildDateTimeParseInfo(TestCase): - self.assertEqual(self.info(('M', 2)), '([0-9]{2})') - - def testMonthNames(self): -- names = [u'Januar', u'Februar', u'Maerz', u'April', -- u'Mai', u'Juni', u'Juli', u'August', u'September', u'Oktober', -- u'November', u'Dezember'] -+ names = ['Januar', 'Februar', 'Maerz', 'April', -+ 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', -+ 'November', 'Dezember'] - self.assertEqual(self.info(('M', 4)), '('+'|'.join(names)+')') - - def testMonthAbbr(self): -@@ -255,26 +255,26 @@ class TestDateTimeFormat(TestCase): - format = DateTimeFormat(calendar=LocaleCalendarStub()) - - def testInterfaceConformity(self): -- self.assert_(IDateTimeFormat.providedBy(self.format)) -+ self.assertTrue(IDateTimeFormat.providedBy(self.format)) - - def testParseSimpleDateTime(self): - # German short - self.assertEqual( - self.format.parse('02.01.03 21:48', 'dd.MM.yy HH:mm'), -- datetime.datetime(2003, 01, 02, 21, 48)) -+ datetime.datetime(2003, 0o1, 0o2, 21, 48)) - - def testParseRealDateTime(self): - # German medium - self.assertEqual( - self.format.parse('02.01.2003 21:48:01', 'dd.MM.yyyy HH:mm:ss'), -- datetime.datetime(2003, 01, 02, 21, 48, 01)) -+ datetime.datetime(2003, 0o1, 0o2, 21, 48, 0o1)) - - # German long - # TODO: The parser does not support timezones yet. - self.assertEqual(self.format.parse( - '2. Januar 2003 21:48:01 +100', - 'd. MMMM yyyy HH:mm:ss z'), -- datetime.datetime(2003, 01, 02, 21, 48, 01, -+ datetime.datetime(2003, 0o1, 0o2, 21, 48, 0o1, - tzinfo=pytz.timezone('Europe/Berlin'))) - - # German full -@@ -282,13 +282,13 @@ class TestDateTimeFormat(TestCase): - self.assertEqual(self.format.parse( - 'Donnerstag, 2. Januar 2003 21:48 Uhr +100', - "EEEE, d. MMMM yyyy H:mm' Uhr 'z"), -- datetime.datetime(2003, 01, 02, 21, 48, -+ datetime.datetime(2003, 0o1, 0o2, 21, 48, - tzinfo=pytz.timezone('Europe/Berlin'))) - - def testParseAMPMDateTime(self): - self.assertEqual( - self.format.parse('02.01.03 09:48 nachm.', 'dd.MM.yy hh:mm a'), -- datetime.datetime(2003, 01, 02, 21, 48)) -+ datetime.datetime(2003, 0o1, 0o2, 21, 48)) - - def testParseTimeZone(self): - dt = self.format.parse('09:48 -600', 'HH:mm z') -@@ -352,28 +352,28 @@ class TestDateTimeFormat(TestCase): - def testParse12PM(self): - self.assertEqual( - self.format.parse('01.01.03 12:00 nachm.', 'dd.MM.yy hh:mm a'), -- datetime.datetime(2003, 01, 01, 12, 00, 00, 00)) -+ datetime.datetime(2003, 0o1, 0o1, 12, 00, 00, 00)) - - def testParseUnusualFormats(self): - self.assertEqual( - self.format.parse('001. Januar 03 0012:00', - 'ddd. MMMMM yy HHHH:mm'), -- datetime.datetime(2003, 01, 01, 12, 00, 00, 00)) -+ datetime.datetime(2003, 0o1, 0o1, 12, 00, 00, 00)) - self.assertEqual( - self.format.parse('0001. Jan 2003 0012:00 vorm.', - 'dddd. MMM yyyy hhhh:mm a'), -- datetime.datetime(2003, 01, 01, 00, 00, 00, 00)) -+ datetime.datetime(2003, 0o1, 0o1, 00, 00, 00, 00)) - - def testFormatSimpleDateTime(self): - # German short - self.assertEqual( -- self.format.format(datetime.datetime(2003, 01, 02, 21, 48), -+ self.format.format(datetime.datetime(2003, 0o1, 0o2, 21, 48), - 'dd.MM.yy HH:mm'), - '02.01.03 21:48') - - def testFormatRealDateTime(self): - tz = pytz.timezone('Europe/Berlin') -- dt = datetime.datetime(2003, 01, 02, 21, 48, 01, tzinfo=tz) -+ dt = datetime.datetime(2003, 0o1, 0o2, 21, 48, 0o1, tzinfo=tz) - # German medium - self.assertEqual( - self.format.format(dt, 'dd.MM.yyyy HH:mm:ss'), -@@ -391,47 +391,47 @@ class TestDateTimeFormat(TestCase): - - def testFormatAMPMDateTime(self): - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 21, 48), -+ datetime.datetime(2003, 0o1, 0o2, 21, 48), - 'dd.MM.yy hh:mm a'), - '02.01.03 09:48 nachm.') - - def testFormatAllWeekdays(self): - for day in range(1, 8): - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, day+5, 21, 48), -+ datetime.datetime(2003, 0o1, day+5, 21, 48), - "EEEE, d. MMMM yyyy H:mm' Uhr 'z"), - '%s, %i. Januar 2003 21:48 Uhr +000' %( - self.format.calendar.days[day][0], day+5)) - - def testFormatTimeZone(self): - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 12, 00), 'z'), -+ datetime.datetime(2003, 0o1, 0o2, 12, 00), 'z'), - '+000') - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 12, 00), 'zz'), -+ datetime.datetime(2003, 0o1, 0o2, 12, 00), 'zz'), - '+00:00') - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 12, 00), 'zzz'), -+ datetime.datetime(2003, 0o1, 0o2, 12, 00), 'zzz'), - 'UTC') - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 12, 00), 'zzzz'), -+ datetime.datetime(2003, 0o1, 0o2, 12, 00), 'zzzz'), - 'UTC') - tz = pytz.timezone('US/Eastern') - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 12, tzinfo=tz), 'z'), -+ datetime.datetime(2003, 0o1, 0o2, 12, tzinfo=tz), 'z'), - '-500') - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 12, tzinfo=tz), 'zz'), -+ datetime.datetime(2003, 0o1, 0o2, 12, tzinfo=tz), 'zz'), - '-05:00') - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 12, tzinfo=tz), 'zzz'), -+ datetime.datetime(2003, 0o1, 0o2, 12, tzinfo=tz), 'zzz'), - 'EST') - self.assertEqual(self.format.format( -- datetime.datetime(2003, 01, 02, 12, tzinfo=tz), 'zzzz'), -+ datetime.datetime(2003, 0o1, 0o2, 12, tzinfo=tz), 'zzzz'), - 'US/Eastern') - - def testFormatWeekDay(self): -- date = datetime.date(2003, 01, 02) -+ date = datetime.date(2003, 0o1, 0o2) - self.assertEqual(self.format.format(date, "E"), - '4') - self.assertEqual(self.format.format(date, "EE"), -@@ -455,7 +455,7 @@ class TestDateTimeFormat(TestCase): - '05') - - def testFormatDayOfWeekInMonth(self): -- date = datetime.date(2003, 01, 02) -+ date = datetime.date(2003, 0o1, 0o2) - self.assertEqual(self.format.format(date, "F"), - '1') - self.assertEqual(self.format.format(date, "FF"), -@@ -526,11 +526,11 @@ class TestDateTimeFormat(TestCase): - - def testFormatSimpleHourRepresentation(self): - self.assertEqual( -- self.format.format(datetime.datetime(2003, 01, 02, 23, 00), -+ self.format.format(datetime.datetime(2003, 0o1, 0o2, 23, 00), - 'dd.MM.yy h:mm:ss a'), - '02.01.03 11:00:00 nachm.') - self.assertEqual( -- self.format.format(datetime.datetime(2003, 01, 02, 02, 00), -+ self.format.format(datetime.datetime(2003, 0o1, 0o2, 0o2, 00), - 'dd.MM.yy h:mm:ss a'), - '02.01.03 2:00:00 vorm.') - self.assertEqual( -@@ -549,54 +549,54 @@ class TestDateTimeFormat(TestCase): - def testFormatDayInYear(self): - self.assertEqual( - self.format.format(datetime.date(2003, 1, 3), 'D'), -- u'3') -+ '3') - self.assertEqual( - self.format.format(datetime.date(2003, 1, 3), 'DD'), -- u'03') -+ '03') - self.assertEqual( - self.format.format(datetime.date(2003, 1, 3), 'DDD'), -- u'003') -+ '003') - self.assertEqual( - self.format.format(datetime.date(2003, 12, 31), 'D'), -- u'365') -+ '365') - self.assertEqual( - self.format.format(datetime.date(2003, 12, 31), 'DD'), -- u'365') -+ '365') - self.assertEqual( - self.format.format(datetime.date(2003, 12, 31), 'DDD'), -- u'365') -+ '365') - self.assertEqual( - self.format.format(datetime.date(2004, 12, 31), 'DDD'), -- u'366') -+ '366') - - def testFormatDayOfWeekInMOnth(self): - self.assertEqual( - self.format.format(datetime.date(2003, 1, 3), 'F'), -- u'1') -+ '1') - self.assertEqual( - self.format.format(datetime.date(2003, 1, 10), 'F'), -- u'2') -+ '2') - self.assertEqual( - self.format.format(datetime.date(2003, 1, 17), 'F'), -- u'3') -+ '3') - self.assertEqual( - self.format.format(datetime.date(2003, 1, 24), 'F'), -- u'4') -+ '4') - self.assertEqual( - self.format.format(datetime.date(2003, 1, 31), 'F'), -- u'5') -+ '5') - self.assertEqual( - self.format.format(datetime.date(2003, 1, 6), 'F'), -- u'1') -+ '1') - - def testFormatUnusualFormats(self): - self.assertEqual( - self.format.format(datetime.date(2003, 1, 3), 'DDD-yyyy'), -- u'003-2003') -+ '003-2003') - self.assertEqual( - self.format.format(datetime.date(2003, 1, 10), - "F. EEEE 'im' MMMM, yyyy"), -- u'2. Freitag im Januar, 2003') -+ '2. Freitag im Januar, 2003') - - - -@@ -828,7 +828,7 @@ class TestNumberFormat(TestCase): - 'infinity': 'oo', 'nan': 'N/A'}) - - def testInterfaceConformity(self): -- self.assert_(INumberFormat.providedBy(self.format)) -+ self.assertTrue(INumberFormat.providedBy(self.format)) - - def testParseSimpleInteger(self): - self.assertEqual(self.format.parse('23341', '###0'), diff --git a/devel/py-zope.i18n/pkg-descr b/devel/py-zope.i18n/pkg-descr deleted file mode 100644 index 520c3dbaca61..000000000000 --- a/devel/py-zope.i18n/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -zope.i18n implements several APIs related to internationalization -and localization: - * Locale objects for all locales maintained by the ICU project. - * Gettext-based message catalogs for message strings. - * Locale discovery for Web-based requests. diff --git a/devel/py-zope.location/Makefile b/devel/py-zope.location/Makefile deleted file mode 100644 index 34706edcc615..000000000000 --- a/devel/py-zope.location/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -PORTNAME= zope.location -PORTVERSION= 3.9.1 -PORTREVISION= 1 -CATEGORIES= devel python zope -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DIST_SUBDIR= zope - -MAINTAINER= zope@FreeBSD.org -COMMENT= Zope Location -WWW= https://pypi.org/project/zope.location/ - -LICENSE= ZPL21 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:net/py-zope.proxy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:devel/py-zope.schema@${PY_FLAVOR} - -USES= python -USE_PYTHON= distutils autoplist - -NO_ARCH= yes - -.include <bsd.port.mk> diff --git a/devel/py-zope.location/distinfo b/devel/py-zope.location/distinfo deleted file mode 100644 index b719bb24f88f..000000000000 --- a/devel/py-zope.location/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (zope/zope.location-3.9.1.tar.gz) = cec909f57def8005973ebff0deada11d2fc25438da34d691a2417eaca2966116 -SIZE (zope/zope.location-3.9.1.tar.gz) = 17737 diff --git a/devel/py-zope.location/pkg-descr b/devel/py-zope.location/pkg-descr deleted file mode 100644 index bdaeef0f4c0a..000000000000 --- a/devel/py-zope.location/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -zope.location are special objects that has a structural location. diff --git a/devel/py-zope.publisher/Makefile b/devel/py-zope.publisher/Makefile *** 1823 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308271132.37RBWArT094539>