From nobody Mon Mar 07 18:27:17 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 A13B91A06D6F; Mon, 7 Mar 2022 18:27:18 +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 4KC6Pf0jZ4z3gyj; Mon, 7 Mar 2022 18:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646677638; 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=4oySzttZ8Jtz8aulmLJIr9Gc2tmxtBQE/JLML9J6twg=; b=h5F83rr+9mcOgI0LT1Jv9hjEvY1ngFMM+JiIypbwqLTQE4pGFzPe0fhhqkfd2eGyGQsqFn FAdZ+BMn6JI63hIAIIJ+YWRiMw3H27btqp7GSkLIRjI1nc9g0Nz42O27HOGxq0PrV+lyE7 aENMF3HMcRoXACE6FTI512ece7OYm7DXD/vRwP0xni2lodLXJVCkAVF4Qe7e1nVegx0jKd X8JSNuF6M7YwVp33Pumd/2ZjTDiq1K7HciAJIwT3xs/u6h/9IeFUY+M1sFdIrCfCf2JJBu znKwHqUyEruOesD2qA5squV7vbxUmtE89717J3hCbOpuduJyqrKessoSILcqBw== 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 36CB057E3; Mon, 7 Mar 2022 18:27:17 +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 227IRHbo085788; Mon, 7 Mar 2022 18:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227IRHFN085787; Mon, 7 Mar 2022 18:27:17 GMT (envelope-from git) Date: Mon, 7 Mar 2022 18:27:17 GMT Message-Id: <202203071827.227IRHFN085787@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: da1c43d8c935 - main - devel/py-zope.testing: 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: da1c43d8c93598f3ac2b91f3705c367c4afc54f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646677638; 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=4oySzttZ8Jtz8aulmLJIr9Gc2tmxtBQE/JLML9J6twg=; b=u6bmUcR6LLF4uUJ+np6sUBEMCl+y2p4fgi1jJjqZFB1pTnDiz1ZxbZ22tVPBnuf2Fx1/Iy R6nkXMOnrXfm8UzVStZfDGSAMHMP1ytvBSHkohXuwKjwssTVBa5Cl0Tb6ZKCoscrNCNIdK 73O4pRsVjN67xYYpgB0w01uZk8rOSIgTJQXkWY3Kku30t+XufPE/xhGdx6MIzLDg7TVsik CUnbRhgZIzblgRgDH/VGyECe9I/9vUzYprUK/ETmn4+5JwllCE7F0a9MeLO+EzVjQnNEb1 fng+8UQC61ngMBPVzhuf0LMMJ/k87dgCnhBhT/0a2qoI62UJ1RAeDDiVYYDoGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646677638; a=rsa-sha256; cv=none; b=B+kzCNTECNIlLrGJZ1auIVliULit0A1GE2hpNxDz9lnVh9IpjFD1Tmhq0/Rwun+kAN8KUm MHR0Rq7uEtnXkOvHO7IhPkKavwIQ4BI5ti22cf0F+fUdkYrjvTwcatOxq8RYK/jjieJDY/ WuxUf6T1h+O2rZI0+Nqe6zG0vMSr2Hdjb5l4hlq0AYwYPLjNxOXW4SN0BMK2YWbHkz3ZiV xH6AKFDhnLIgqsDC7yGLG7aHiVMVZH6o84I+FQ0RyccEecvdVKsS7qqOCvRcF34BWxbdQv d1TG9l5r6eTQ5mK2RlbQMpwYn+5ZeHpDA6nXRfPjQ37JVzK+G2u2NCmwBcEMXA== 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=da1c43d8c93598f3ac2b91f3705c367c4afc54f7 commit da1c43d8c93598f3ac2b91f3705c367c4afc54f7 Author: Po-Chuan Hsieh AuthorDate: 2022-03-07 18:07:27 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-07 18:13:19 +0000 devel/py-zope.testing: Fix build with setuptools 58.0.0+ With hat: python --- devel/py-zope.testing/files/patch-2to3 | 145 +++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/devel/py-zope.testing/files/patch-2to3 b/devel/py-zope.testing/files/patch-2to3 new file mode 100644 index 000000000000..e1525aa05650 --- /dev/null +++ b/devel/py-zope.testing/files/patch-2to3 @@ -0,0 +1,145 @@ +--- setup.py.orig 2012-01-29 14:23:38 UTC ++++ setup.py +@@ -24,12 +24,6 @@ from setuptools import setup + import sys + if sys.version > '3': + extras = dict( +- use_2to3 = True, +- convert_2to3_doctests = ['src/zope/testing/doctest.txt', +- 'src/zope/testing/formparser.txt', +- 'src/zope/testing/module.txt', +- 'src/zope/testing/setupstack.txt', +- ], + dependency_links = ['.'], # Only until zope.interface 3.6 and zope.exception 3.6 has been released. + ) + else: +--- src/zope/testing/doctest/__init__.py.orig 2012-01-29 14:23:14 UTC ++++ src/zope/testing/doctest/__init__.py +@@ -84,7 +84,7 @@ if sys.version < '2.6.5': + If the string `s` is Unicode, it is encoded using the stdout + encoding and the `backslashreplace` error handler. + """ +- if isinstance(s, unicode): ++ if isinstance(s, str): + s = s.encode(doctest._encoding, 'backslashreplace') + # This regexp matches the start of non-blank lines: + return re.sub('(?m)^(?!$)', indent*' ', s) +@@ -216,7 +216,7 @@ doctest.DocTestCase.tearDown = _patched_tearDown + # Patch so you can set REPORT_ONLY_FIRST_FAILURE even if you have a DIFF flag + # on the test. + import sys +-from StringIO import StringIO ++from io import StringIO + + def _patched_runTest(self): + test = self._dt_test +--- src/zope/testing/doctestunit.py.orig 2012-01-29 14:23:14 UTC ++++ src/zope/testing/doctestunit.py +@@ -22,8 +22,8 @@ warnings.warn('zope.testing.doctestunit is deprecated + 'the Python standard library doctest module', DeprecationWarning, + stacklevel=2) + +-from doctest import DocFileSuite, DocTestSuite +-from doctest import debug_src, debug ++from .doctest import DocFileSuite, DocTestSuite ++from .doctest import debug_src, debug + + def pprint(): + from pprint import PrettyPrinter +--- src/zope/testing/formparser.py.orig 2012-01-29 14:23:14 UTC ++++ src/zope/testing/formparser.py +@@ -11,8 +11,8 @@ the `zope.testbrowser` package. + """ + __docformat__ = "reStructuredText" + +-import HTMLParser +-import urlparse ++import html.parser ++import urllib.parse + + + def parse(data, base=None): +@@ -30,7 +30,7 @@ class FormParser(object): + def __init__(self, data, base=None): + self.data = data + self.base = base +- self._parser = HTMLParser.HTMLParser() ++ self._parser = html.parser.HTMLParser() + self._parser.handle_data = self._handle_data + self._parser.handle_endtag = self._handle_endtag + self._parser.handle_starttag = self._handle_starttag +@@ -80,7 +80,7 @@ class FormParser(object): + method = kwattr(d, "method", "get") + action = d.get("action", "").strip() or None + if self.base and action: +- action = urlparse.urljoin(self.base, action) ++ action = urllib.parse.urljoin(self.base, action) + enctype = kwattr(d, "enctype", "application/x-www-form-urlencoded") + self.current = Form(name, id, method, action, enctype) + self.forms.append(self.current) +@@ -91,7 +91,7 @@ class FormParser(object): + readonly = "readonly" in d + src = d.get("src", "").strip() or None + if self.base and src: +- src = urlparse.urljoin(self.base, src) ++ src = urllib.parse.urljoin(self.base, src) + value = d.get("value") + size = intattr(d, "size") + maxlength = intattr(d, "maxlength") +@@ -113,7 +113,7 @@ class FormParser(object): + elif tag == "base": + href = d.get("href", "").strip() + if href and self.base: +- href = urlparse.urljoin(self.base, href) ++ href = urllib.parse.urljoin(self.base, href) + self.base = href + elif tag == "select": + disabled = "disabled" in d +--- src/zope/testing/server.py.orig 2012-01-29 14:23:14 UTC ++++ src/zope/testing/server.py +@@ -22,9 +22,9 @@ in the browser, the username and password are optional + done with inspecting the application press Ctrl+C to continue with the + functional test. + """ +-import urlparse ++import urllib.parse + import webbrowser +-from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler ++from http.server import HTTPServer, BaseHTTPRequestHandler + import sys + + +@@ -78,10 +78,10 @@ def addPortToURL(url, port): + 'http://localhost:555/index.html' + + """ +- (scheme, netloc, url, query, fragment) = urlparse.urlsplit(url) ++ (scheme, netloc, url, query, fragment) = urllib.parse.urlsplit(url) + netloc = netloc.split(':')[0] + netloc = "%s:%s" % (netloc, port) +- url = urlparse.urlunsplit((scheme, netloc, url, query, fragment)) ++ url = urllib.parse.urlunsplit((scheme, netloc, url, query, fragment)) + return url + + +@@ -93,7 +93,7 @@ def startServer(http, url, user=None, password=None, p + httpd = HTTPServer(server_address, requestHandler) + # XXX we rely on browser being slower than our server + webbrowser.open(url) +- print >> sys.stderr, 'Starting HTTP server...' ++ print('Starting HTTP server...', file=sys.stderr) + httpd.serve_forever() + except KeyboardInterrupt: +- print >> sys.stderr, 'Stopped HTTP server.' ++ print('Stopped HTTP server.', file=sys.stderr) +--- src/zope/testing/tests.py.orig 2012-01-29 14:23:14 UTC ++++ src/zope/testing/tests.py +@@ -12,7 +12,7 @@ + """Tests for the testing framework. + """ + +-import doctest ++from . import doctest + import sys + import re + import unittest