From nobody Fri Mar 25 13:50:40 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 74AE11A34361; Fri, 25 Mar 2022 13:50:42 +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 4KQ3Q930GCz3h6n; Fri, 25 Mar 2022 13:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216242; 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=/m/lILJHpHjBCZWCUvXR52ih4yb5W5W6PjDx6dOwwvM=; b=F/bDyK//VohgihwPp+Sq8xV97+GGvYzeaouJt0UyDy5ArySznNUM7Mf/8W1t983rI7OC5B Rybssng+luRzsost+JvU3sR31MI8d+IZ0y/k4DpQKCXBzMotNwgysAGr/fxV5HZGfIB5ss ZYMF5lav25MeV8+6xGCObRqpdpetXnTzoqdyoEFGzr2HYgXrOXh6mfHqi6jkSS3/SHusLB Sz2xxPRRfQkTpnTJSIfhOamX2G6dSeSyUCMxd8kA3qOtuhfS0x0QE6jO2SihgTNAhZWq0F HLUfPRbPIwegqZhLTT79ogD8m/gmNqd/taUYug0/v+ANlFTSD6mNGCSoKqxKAA== 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 093005987; Fri, 25 Mar 2022 13:50:41 +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 22PDoejL037261; Fri, 25 Mar 2022 13:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDoexe037260; Fri, 25 Mar 2022 13:50:40 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:40 GMT Message-Id: <202203251350.22PDoexe037260@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: 146939ad895d - main - net/py-amqplib: 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: 146939ad895d774de5b62f39b81f38af45c64bea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216242; 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=/m/lILJHpHjBCZWCUvXR52ih4yb5W5W6PjDx6dOwwvM=; b=MO6phZpe0xWJAIAaTdtkCalG/Ul3vIxdDaacs4HXR4TMdpgMdVWHh5md2LCovoqZ3ajxG5 hpz2Pr6j7JkEMcfHFqzcIOdnt4LFSshQGdNrAjY+rH5PtLz5SJzPRIcNQpSxIPxpOPcuHk XqED493SngWkL7OKtXKBOV6+kWYopzAzyfgiceRwcA8SQ/GJEEGxWF4AiUBJw71Lla4AEI v4OjlfvT2cu5TXKXZ87ORIjVO9fl3F7jNBEYjF2AI4BtgIxaxD5Bsv69sy1OOaHXYiMzKF yhN3IC9o/2JP+OIZ4UEcm5b4eOrb4W+c0uuRk4ViCuAS7sKFgYP9YMHtKR4jFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216242; a=rsa-sha256; cv=none; b=gjvwKaF7uOWFCsPozxNiRzS0tjoR8rvp9yrDOV9Y/raEPpYvsAp8lpqRkMu/w/tq/wx8rn VOYdrcfzj/trxgc36l5bz+6gwJX1RzCRpJ4fHXmDkunQOGkkMXyY4lrPfSU5Ezuiyp0rVU Ub3uvlvo6rHJQlnaldu2plQso5yHZxLxlg9+WCvmpFHuRsIRSinJQ4T+YC31g0Y6HvPN/H +UIdGqrN6ZeoDa3iBN5qr/SwI4s8y/Bp73RfDL9YedYgk1ezZe/0JrGjcScNWlbRGwwFBe /FdMV48bdG0zGyKVJAyeIzVHHBjA2AP4c6oytkUL4vxcQ9GKYZDvOhLvF1IQeQ== 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=146939ad895d774de5b62f39b81f38af45c64bea commit 146939ad895d774de5b62f39b81f38af45c64bea Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:33:09 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:18 +0000 net/py-amqplib: Fix build with setuptools 58.0.0+ With hat: python --- net/py-amqplib/files/patch-2to3 | 69 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/net/py-amqplib/files/patch-2to3 b/net/py-amqplib/files/patch-2to3 new file mode 100644 index 000000000000..7b54af46f999 --- /dev/null +++ b/net/py-amqplib/files/patch-2to3 @@ -0,0 +1,69 @@ +--- amqplib/client_0_8/method_framing.py.orig 2011-03-29 17:09:17 UTC ++++ amqplib/client_0_8/method_framing.py +@@ -18,7 +18,7 @@ Convert between frames and higher-level AMQP methods + # License along with this library; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + +-from Queue import Empty, Queue ++from queue import Empty, Queue + from struct import pack, unpack + + try: +@@ -49,9 +49,9 @@ except: + return result + + +-from basic_message import Message +-from exceptions import * +-from serialization import AMQPReader ++from .basic_message import Message ++from .exceptions import * ++from .serialization import AMQPReader + + __all__ = [ + 'MethodReader', +@@ -131,7 +131,7 @@ class MethodReader(object): + while self.queue.empty(): + try: + frame_type, channel, payload = self.source.read_frame() +- except Exception, e: ++ except Exception as e: + # + # Connection was closed? Framing Error? + # +@@ -241,7 +241,7 @@ class MethodWriter(object): + # problem with the content properties, before sending the + # first frame + body = content.body +- if isinstance(body, unicode): ++ if isinstance(body, str): + coding = content.properties.get('content_encoding', None) + if coding is None: + coding = content.properties['content_encoding'] = 'UTF-8' +@@ -257,5 +257,5 @@ class MethodWriter(object): + self.dest.write_frame(2, channel, payload) + + chunk_size = self.frame_max - 8 +- for i in xrange(0, len(body), chunk_size): ++ for i in range(0, len(body), chunk_size): + self.dest.write_frame(3, channel, body[i:i+chunk_size]) +--- amqplib/client_0_8/transport.py.orig 2011-09-28 22:10:35 UTC ++++ amqplib/client_0_8/transport.py +@@ -74,7 +74,7 @@ class _AbstractTransport(object): + self.sock = socket.socket(af, socktype, proto) + self.sock.settimeout(connect_timeout) + self.sock.connect(sa) +- except socket.error, msg: ++ except socket.error as msg: + self.sock.close() + self.sock = None + continue +@@ -82,7 +82,7 @@ class _AbstractTransport(object): + + if not self.sock: + # Didn't connect, return the most recent error message +- raise socket.error, msg ++ raise socket.error(msg) + + self.sock.settimeout(None) + self.sock.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)