From nobody Sat Apr 16 04:25:38 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 B79177CEFBE; Sat, 16 Apr 2022 04:25:40 +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 4KgKr35vsDz3PZQ; Sat, 16 Apr 2022 04:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650083140; 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=GbmwvG9TFCwTCaBab4fT6z501oIzPQ8xcnalEcXvlag=; b=SV331OPPa4rw0+J13XSFFbLP+tDN5psV1rc2ValhoaZAvw8YfYc8Cv/tWXoBn5FMFOO+Oq SaPiy3Tp9vSsqBc7smxgxxlmKZijZ2u87DcaPYDpgUDdOW9BF7JHTmZl+h79d/58z64sXS SqPW6zCkU++Lhoz1xpOak5SlYOAg3atei8bu5PsaEE31g8I9kxSNoOz4Zu2rkQ6EDBja/1 rRg/TmH9y6ufqshz0MG2j0xV3HBkL3spke+U79p3hlny54rVdE1a1pELd9g2Tab+okXbPG fTnBhzEdMKMcBv6NlUwIllyRaAqQcUa0uiV8UaC1MoQbjJt/+899k889A5EWDw== 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 0353022D76; Sat, 16 Apr 2022 04:25:39 +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 23G4PcoM009042; Sat, 16 Apr 2022 04:25:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G4Pct2009041; Sat, 16 Apr 2022 04:25:38 GMT (envelope-from git) Date: Sat, 16 Apr 2022 04:25:38 GMT Message-Id: <202204160425.23G4Pct2009041@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: cc85feb7974a - main - net/py-msrplib: Fix build with setuptools 61.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: cc85feb7974aa8243f7abac7efd389b430829de6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650083140; 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=GbmwvG9TFCwTCaBab4fT6z501oIzPQ8xcnalEcXvlag=; b=T/HIgRabKFe6nwg623k0Kbh6BmZR5UojURqhLocHS3yo9ettOxzCh3RI/AK58JciKpYcWC Jl8ap2bN8odTVWgBj/PeS+VHKiZzvH9ICf5uOctxDnLgWWN8/kS+mKHZwvn3mskw/8OcGd JbBSPkc/ZNp48el3jopv0U8sAzo/unM7oP401JyeXsvQA0v8GPQdjaTmYhMiBKczxzMduN GQux+2EJjXEGnKBvbbMKv3RgCNxTXfRWmyz+DsmYZtwfPmt/XW7eoYdEpWZvUL0fg2KcS+ 4fvgXP9NJr/gjjnuNdkagyaAo/vI0V07Vzyon7+hbngszFak1TgkO+tbJNanCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650083140; a=rsa-sha256; cv=none; b=c3VyvpoZGQ4obcI5ZJXfyAl7X5F8mW9wfe8x8rpzSwl3Dtrt4Fi5jqyHv1DtB21put9b26 fNn+9ynFtjZ/aZ5Vp8Cons7shyYknTFx1hiLj9DwboEWC4gaC6AjkQw2RfQETsUWJw12Qe WqHJ8XpIQPoeqCtwVp6xJGNZSof2IjicL2PyXFF4dIAevoaeX1hJfx8+nD28QbgSeEbaDB xSBFRjy8hyYFklVrhV5ZvWIX2thO/52TqpSKajqY9R3ejwLYon3G40HyGsjqEpdLacT5Hc JLMUQdKNHe064Y+aH3zl4NkUnbepfioz4KOXk3Ehiu50LIfye5lwoIDL3ON44w== 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=cc85feb7974aa8243f7abac7efd389b430829de6 commit cc85feb7974aa8243f7abac7efd389b430829de6 Author: Po-Chuan Hsieh AuthorDate: 2022-04-16 04:15:55 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-04-16 04:19:55 +0000 net/py-msrplib: Fix build with setuptools 61.0.0+ With hat: python --- net/py-msrplib/files/patch-2to3 | 69 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/net/py-msrplib/files/patch-2to3 b/net/py-msrplib/files/patch-2to3 new file mode 100644 index 000000000000..edbd524cf770 --- /dev/null +++ b/net/py-msrplib/files/patch-2to3 @@ -0,0 +1,69 @@ +--- msrplib/digest.py.orig 2017-09-29 19:26:59 UTC ++++ msrplib/digest.py +@@ -6,7 +6,7 @@ from base64 import b64encode, b64decode + import random + + def get_random_data(length): +- return ''.join(chr(random.randint(0, 255)) for x in xrange(length)) ++ return ''.join(chr(random.randint(0, 255)) for x in range(length)) + + class LoginFailed(Exception): + pass +@@ -28,7 +28,7 @@ def calc_hash(**parameters): + return md5(hash_text).hexdigest() + + def calc_responses(**parameters): +- if parameters.has_key("ha1"): ++ if "ha1" in parameters: + ha1 = parameters.pop("ha1") + else: + ha1 = calc_ha1(**parameters) +@@ -80,7 +80,7 @@ class AuthChallenger(object): + nonce = parameters["nonce"] + opaque = parameters["opaque"] + response = parameters["response"] +- except IndexError, e: ++ except IndexError as e: + raise LoginFailed("Parameter not present: %s", e.message) + try: + expected_response, rspauth = calc_responses(ha1 = ha1, **parameters) +--- msrplib/session.py.orig 2020-02-07 08:31:31 UTC ++++ msrplib/session.py +@@ -120,7 +120,7 @@ class MSRPSession(object): + chunk = self.msrp.make_send_request() + chunk.add_header(protocol.MSRPHeader('Keep-Alive', 'yes')) + self.deliver_chunk(chunk) +- except MSRPTransactionError, e: ++ except MSRPTransactionError as e: + if e.code == 408: + self.msrp.loseConnection(wait=False) + self.set_state('CLOSING') +@@ -237,7 +237,7 @@ class MSRPSession(object): + if item is None: + break + self._write_chunk(item.chunk, item.response_callback) +- except ConnectionClosedErrors + (proc.LinkedExited, proc.ProcExit), e: ++ except ConnectionClosedErrors + (proc.LinkedExited, proc.ProcExit) as e: + self.logger.debug('writer: exiting because of %r' % e) + except: + self.logger.exception('writer: captured unhandled exception:') +--- msrplib/transport.py.orig 2020-02-07 08:31:31 UTC ++++ msrplib/transport.py +@@ -46,7 +46,7 @@ class MSRPNoSuchSessionError(MSRPTransactionError): + comment = 'No such session' + + +-data_start, data_end, data_write, data_final_write = range(4) ++data_start, data_end, data_write, data_final_write = list(range(4)) + + + def make_report(chunk, code, comment): +@@ -244,7 +244,7 @@ class MSRPTransport(GreenTransportBase): + """Generate and write the response, lose the connection in case of error""" + try: + response = make_response(chunk, code, comment) +- except ChunkParseError, ex: ++ except ChunkParseError as ex: + log.error('Failed to generate a response: %s' % ex) + self.loseConnection(wait=False) + raise