From nobody Fri Mar 25 13:49:50 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 012C81A33A91; Fri, 25 Mar 2022 13:49:51 +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 4KQ3PB4HVPz3QqZ; Fri, 25 Mar 2022 13:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216190; 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=FgHZSNz2PQgum6ErBaWWiTItbUME1cZmCX8moPThNsk=; b=RtA1v36zPeZxA4IxG1n7hUtqs3nbuJ0Y81lAmKQnT/nT+ODnsy8ToSOZdeane3Qsck8xBP sykfqMJ1w5wu5O22cHPs6V5pk/Y+DfF6kDnGbqLOSskpawUbu0E1Axh1LfyziOUxF5GiDK poe4G74KdLeV89SG/AaCGLM3o8A3vBhO15Ym2Pbqva/rtjvgn00SqFIkRJcbP+WZnsQEWp geIOqIu7cvkfOY1l74+sKModCqIQaEpZa4fvXLMZEcXCL4YC2aRQYKMbdWXNt94RoeNmZl hSUwW1IIjcjsMoLc0pKHHapXEPu7lfZXWqYns33tcVvqFroie8RuDUZ59TYBow== 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 6A35E594A; Fri, 25 Mar 2022 13:49:50 +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 22PDno2S027870; Fri, 25 Mar 2022 13:49:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDnofI027869; Fri, 25 Mar 2022 13:49:50 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:49:50 GMT Message-Id: <202203251349.22PDnofI027869@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: 617bcc40fc1c - main - devel/py-Products.ExternalEditor: 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: 617bcc40fc1cf7f5dced580e0d471a8839c2a807 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216190; 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=FgHZSNz2PQgum6ErBaWWiTItbUME1cZmCX8moPThNsk=; b=dWyjNtCXX1GdCEOiQkRLthn6amGomuT2Jqp8qLO5tLIXpabSEHZnIcqi0TKVw3eCbRRgjB mGWos/tcBbFG76oAUum/ZK12cvq8tmq59Dc50h+vzliTQiZemZtg3XdNTH1ZwOUQ+xVz6R FKYyr645/3lHPNzk0RYHsbZmXTv2S4jFuppMT1sti88C1+PDnOChAEZRFAmv7nv/POZS96 GxajWdx6oH1yJO73o1ApcKIfBFmdPSPj7v9Yx3o/MUoxH0+2it+1/dwd+6EVvUhDv7NTrz T8t5cEJZANLWbUKRKcffxZzsFnc61dC55Dfl5ITSqcM6kinj/7Wp9hlNZyRLxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216190; a=rsa-sha256; cv=none; b=sx5Rmg8bZ4sqCPdqQKWgn0UvTSBcaWCbf/MkOzulgzOYHXmaxBIgnJWUX8q0boUo2RsM9t 4FrNHldhYXkV+TKu4CA/CXAqOlh/+gQ7eoNqcB2LUsz8/2q+hgVIXpkEblnZr5oEGZlDza FaBZlgR4+UWFTzaQvei/BxcbwjK2/hT+kInCkVCl26174JiQO3HabEi5aUNBMWctFFXFaK rlOEzHHxBdqwY10MmN/x3EudEPhQU7WNnZ5Qj/JxVdrffqsNeH6GZy5t9cD3RqfMLOVJwz JnOu6cEOb+QuFGEoM1c15Ph/RvqtFkPnG78kh5vUanv3QnQGzWXRbFx+4E1ZGA== 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=617bcc40fc1cf7f5dced580e0d471a8839c2a807 commit 617bcc40fc1cf7f5dced580e0d471a8839c2a807 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:10 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:07 +0000 devel/py-Products.ExternalEditor: Fix build with setuptools 58.0.0+ With hat: python --- devel/py-Products.ExternalEditor/files/patch-2to3 | 64 +++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/devel/py-Products.ExternalEditor/files/patch-2to3 b/devel/py-Products.ExternalEditor/files/patch-2to3 new file mode 100644 index 000000000000..55bdf96341c3 --- /dev/null +++ b/devel/py-Products.ExternalEditor/files/patch-2to3 @@ -0,0 +1,64 @@ +--- Products/ExternalEditor/ExternalEditor.py.orig 2010-12-03 03:58:58 UTC ++++ Products/ExternalEditor/ExternalEditor.py +@@ -18,7 +18,7 @@ + + from string import join # For Zope 2.3 compatibility + import types +-import urllib ++import urllib.request, urllib.parse, urllib.error + from Acquisition import aq_inner, aq_base, aq_parent, Implicit + try: + from App.class_init import InitializeClass +@@ -55,11 +55,11 @@ class PDataStreamIterator: + def __iter__(self): + return self + +- def next(self): ++ def __next__(self): + if self.data is None: +- raise StopIteration ++ raise(StopIteration) + data = self.data.data +- self.data = self.data.next ++ self.data = self.data.__next__ + return data + + def registerCallback(cb): +@@ -125,8 +125,8 @@ class ExternalEditor(Implicit): + if title is not None: + if callable(title): + title = title() +- if isinstance(title, types.UnicodeType): +- title = unicode.encode(title, 'utf-8') ++ if isinstance(title, str): ++ title = str.encode(title, 'utf-8') + r.append('title:%s' % title) + + if hasattr(aq_base(ob), 'content_type'): +@@ -214,7 +214,7 @@ class ExternalEditor(Implicit): + body = ob.read() + else: + # can't read it! +- raise 'BadRequest', 'Object does not support external editing' ++ raise BadRequest('Object does not support external editing') + + if (HAVE_Z3_IFACE and IStreamIterator.providedBy(body) or + (not HAVE_Z3_IFACE) and IStreamIterator.isImplementedBy(body)): +@@ -287,7 +287,7 @@ def EditLink(self, object, borrow_lock=0, skip_data=0) + if skip_data: + query['skip_data'] = 1 + url = "%s/externalEdit_/%s%s%s" % (aq_parent(aq_inner(object)).absolute_url(), +- urllib.quote(object.getId()), ++ urllib.parse.quote(object.getId()), + ext, querystr(query)) + return ('' +@@ -302,7 +302,7 @@ def querystr(d): + """Create a query string from a dict""" + if d: + return '?' + '&'.join( +- ['%s=%s' % (name, val) for name, val in d.items()]) ++ ['%s=%s' % (name, val) for name, val in list(d.items())]) + else: + return '' +