From nobody Fri Mar 25 13:50:20 2022 X-Original-To: dev-commits-ports-main@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 D17401A34130; Fri, 25 Mar 2022 13:50:22 +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 4KQ3Pn3QCMz3gxj; Fri, 25 Mar 2022 13:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216221; 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=93qWVwfdBSdglNe5AHXDvG4uV82sHvbGYN+6dMUJwgI=; b=y12m5Jmq13iMGw7XyMVxpPPs5mctpExW/oZE7brvow2vuLouKKZQ041rlvQ8mLnzDpz57k 3em2HcAlODtQEaIo+B0ndWwxa1vM0w02wQvjKz9WBlqxvBlMY16OG1Y3EWjFHW65BmL8sK nS6wbg3gVv6g2L9sHRJLsprD7t3u+buLOLQOY6kV0EkGjmN7TG05kIX4wg9vCSuH/I79ET 4OkkcEq4oVRX4iLqelLYMjaMui4ys1a4iovWAnF9legE5MeTfHuM9WfNAtHdlBUJEgu/4r YxNRkjZTCDJWy/5q9tdjk3k5IUjV+3yBL8re6JMhW1lZ3GzhZ2McMreMKApJlA== 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 8A0695952; Fri, 25 Mar 2022 13:50:20 +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 22PDoKNI036081; Fri, 25 Mar 2022 13:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDoK5b036074; Fri, 25 Mar 2022 13:50:20 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:20 GMT Message-Id: <202203251350.22PDoK5b036074@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: 4157a2754239 - main - devel/py-zope.contenttype: Fix build with setuptools 58.0.0+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 4157a275423978c88ba7569acc4bfb006e7340d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216221; 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=93qWVwfdBSdglNe5AHXDvG4uV82sHvbGYN+6dMUJwgI=; b=SZEuqg6BzBHUKyBmlXv44rMlAzyl3F55+RWfQX77Myw2ETRaV3ZV6J7qqQSnHs851hIe62 HcKY/pEYMqFgFzoIr2UFqiqA0NEJ6EWddv2XlzV+IYUMwWvNUE1Mcm+zjkXui8cfIpIMEr /8CONvueeNqmePdfv5EIpAv/GmLIm2xlOYMYKfeCRpXWKalS0zunUXD8hWhkCbu/8GNc/H LnuC0ax+DCWwvaNfNpPHz4SuwIUytRTcEZTrunveFaG7+33tt1T7ZiumU9gngYJ/4ISete hKV7WpcSksYa7BDpd9C/kHJhxc4kt89jpe+6yk6bJXqyQj78ZQl4TobxfVqGxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216221; a=rsa-sha256; cv=none; b=kqp+WrakHGUzmcDReDcnNspQ7M8eFMIwhDrzwB4JRlpPtzTYCNv90RaY8SFY7DXy/N/3bG G4bwZni4VeFq8l4q2VEQCgFxVJQThtfRvddmw30Kygca36UkiKg/p64gS9rpTquSz9nDTP n1aUISXb7mPPoFWY6oG+r2b23521+Pzsriuv1HGWgpwGWyI+uQZ6rahdFyE27yoF6W4jfv /o24GiHRkk0v6K904baSapidFg1a6o/5xPpwMmVSi8wd8dfZ7FaFoo9WbGllAtn1Etokjb HfbqOAYNX7Te86npheRVm7tWV8GY2f0wxXsOobApOoCde+TugkHBtCwYX2XsyQ== 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=4157a275423978c88ba7569acc4bfb006e7340d3 commit 4157a275423978c88ba7569acc4bfb006e7340d3 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:28 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:13 +0000 devel/py-zope.contenttype: Fix build with setuptools 58.0.0+ With hat: python --- devel/py-zope.contenttype/files/patch-2to3 | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/devel/py-zope.contenttype/files/patch-2to3 b/devel/py-zope.contenttype/files/patch-2to3 new file mode 100644 index 000000000000..490d88cb1cf2 --- /dev/null +++ b/devel/py-zope.contenttype/files/patch-2to3 @@ -0,0 +1,31 @@ +--- 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: