From nobody Fri Mar 25 13:50:27 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 990C31A3415C; Fri, 25 Mar 2022 13:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ3Pw4SCQz3RDw; Fri, 25 Mar 2022 13:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=svB65Nu+IEOpDNTo2BtysHxY0TotKz+J3u7Ri//R+A4=; b=d9Xj1x/YxNm9WZUjpdu41PeT7Vy/GGYmyEQk5KONcFuSIrWP3fjMlos03MJp0o9esFkuvU yHFyOazrO5AeMjuIIv6MtzXmv1zb7J45UFYPtruzylFdOs6smfNmQ4xNmHXCSTATSlWHRS 4sYKoKZH7fj3M5ZEYSXGsruFSF28OlGNEIkRJEHX6ssY6/9nv2Clz6lHKjaCNrZ2JXKlnp t6lsVMVMluxSfdHWk1Fdv/kd0dpSgLq+v0Hi7A29tBn2zulzQHFPOSEix3JcKBE03blSbI q2BAP91eGm0k0hxhbHJPcbL86cGHCnTQv00fx30YFtr8WFVsqt5o/xmLI6yYIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51C075544; Fri, 25 Mar 2022 13:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PDoRtM036961; Fri, 25 Mar 2022 13:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDoR31036960; Fri, 25 Mar 2022 13:50:27 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:27 GMT Message-Id: <202203251350.22PDoR31036960@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4cc41f24b36e - main - devel/py-zope.size: Fix build with setuptools 58.0.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cc41f24b36e7b4d12c01946ea664014a31e0ba9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=svB65Nu+IEOpDNTo2BtysHxY0TotKz+J3u7Ri//R+A4=; b=XhVUASGi6g0r10jAenUAfreGFN+McA62nFZoPHR4XpK/6JiqBzj8JBeMYGEBE3RoanPEz/ OwmBt1C50LK7K9shVcM8iUYEebyYNZ1GTuF3sik6121AYgwpUHEI8kW0bNpbVx1GLJP4St /LWwBAoAd24vwNzN3lZ59hvJob0dxg2x3xEZBgCSf0L9fWvAIdT3qgp+gFTpaWlp7YOx5N Lm1k6kIbvltnQeZtKuHQHux9mBiL1lY37j7UEluGvLk4gsZ/rqY6Et4g7IYx38OEJGn2KV onEA8f0E5rBltXzIwzzycZuYz1b2Y029lxvP0K9uAmOlVkbljGukNu684kCgRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216229; a=rsa-sha256; cv=none; b=Ui4m+6LZz2pbZme6FrqFEJwJQVtr9ckcKW8NeSzQgURLGM3T/qxZ9yfFACZHCa5UqM/HrW T+9AUK3K2hQ3RtVM67c4H43HhswlZnsIWWUSVws2jF+4PUMEhTZxtdCQh5hPdIstKQ5PJ2 iZu6dYwAuvwECgTh+L2Lc2O4m2w3J39mnAzYaKTdhP0Sh3tmZKIL/B5BmAhAmLnHdcAm2k YeqhTSLzfA07Jxy53WulHgoSvlxu8R6LKFUKwyhpmFt+XpdEzkWM6jhHjxImo8Yda3AE0z BdLH/G09ZZL+VQ2ddKbcgM15dlDMPtoeAfWWKWM+i1ctpDcj+axRGs85796WVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cc41f24b36e7b4d12c01946ea664014a31e0ba9 commit 4cc41f24b36e7b4d12c01946ea664014a31e0ba9 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:33 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:15 +0000 devel/py-zope.size: Fix build with setuptools 58.0.0+ With hat: python --- devel/py-zope.size/files/patch-2to3 | 78 +++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/devel/py-zope.size/files/patch-2to3 b/devel/py-zope.size/files/patch-2to3 new file mode 100644 index 000000000000..ea7cb7be6369 --- /dev/null +++ b/devel/py-zope.size/files/patch-2to3 @@ -0,0 +1,78 @@ +--- src/zope/size/tests.py.orig 2011-11-29 18:28:40 UTC ++++ src/zope/size/tests.py +@@ -26,7 +26,7 @@ class ZCMLTest(unittest.TestCase): + try: + zope.configuration.xmlconfig.XMLConfig( + 'configure.zcml', zope.size)() +- except Exception, e: ++ except Exception as e: + self.fail(e) + + def test_configure_should_register_n_components(self): +@@ -58,54 +58,54 @@ class Test(unittest.TestCase): + def testImplementsISized(self): + from zope.size import DefaultSized + sized = DefaultSized(object()) +- self.assert_(ISized.providedBy(sized)) ++ self.assertTrue(ISized.providedBy(sized)) + + def testSizeWithBytes(self): + from zope.size import DefaultSized + obj = DummyObject(1023) + sized = DefaultSized(obj) + self.assertEqual(sized.sizeForSorting(), ('byte', 1023)) +- self.assertEqual(sized.sizeForDisplay(), u'1 KB') ++ self.assertEqual(sized.sizeForDisplay(), '1 KB') + + def testSizeWithNone(self): + from zope.size import DefaultSized + obj = DummyObject(None) + sized = DefaultSized(obj) + self.assertEqual(sized.sizeForSorting(), (None, None)) +- self.assertEqual(sized.sizeForDisplay(), u'not-available') ++ self.assertEqual(sized.sizeForDisplay(), 'not-available') + + def testSizeNotAvailable(self): + from zope.size import DefaultSized + sized = DefaultSized(object()) + self.assertEqual(sized.sizeForSorting(), (None, None)) +- self.assertEqual(sized.sizeForDisplay(), u'not-available') ++ self.assertEqual(sized.sizeForDisplay(), 'not-available') + + def testVariousSizes(self): + from zope.size import DefaultSized + + sized = DefaultSized(DummyObject(0)) + self.assertEqual(sized.sizeForSorting(), ('byte', 0)) +- self.assertEqual(sized.sizeForDisplay(), u'0 KB') ++ self.assertEqual(sized.sizeForDisplay(), '0 KB') + + sized = DefaultSized(DummyObject(1)) + self.assertEqual(sized.sizeForSorting(), ('byte', 1)) +- self.assertEqual(sized.sizeForDisplay(), u'1 KB') ++ self.assertEqual(sized.sizeForDisplay(), '1 KB') + + sized = DefaultSized(DummyObject(2048)) + self.assertEqual(sized.sizeForSorting(), ('byte', 2048)) +- self.assertEqual(sized.sizeForDisplay(), u'${size} KB') ++ self.assertEqual(sized.sizeForDisplay(), '${size} KB') + self.assertEqual(sized.sizeForDisplay().mapping, {'size': '2'}) + + sized = DefaultSized(DummyObject(2000000)) + self.assertEqual(sized.sizeForSorting(), ('byte', 2000000)) +- self.assertEqual(sized.sizeForDisplay(), u'${size} MB') ++ self.assertEqual(sized.sizeForDisplay(), '${size} MB') + self.assertEqual(sized.sizeForDisplay().mapping, {'size': '1.91'}) + + def test_byteDisplay(self): + from zope.size import byteDisplay +- self.assertEqual(byteDisplay(0), u'0 KB') +- self.assertEqual(byteDisplay(1), u'1 KB') +- self.assertEqual(byteDisplay(2048), u'${size} KB') ++ self.assertEqual(byteDisplay(0), '0 KB') ++ self.assertEqual(byteDisplay(1), '1 KB') ++ self.assertEqual(byteDisplay(2048), '${size} KB') + self.assertEqual(byteDisplay(2048).mapping, {'size': '2'}) +- self.assertEqual(byteDisplay(2000000), u'${size} MB') ++ self.assertEqual(byteDisplay(2000000), '${size} MB') + self.assertEqual(byteDisplay(2000000).mapping, {'size': '1.91'})