From nobody Mon Mar 7 18:27:27 2022 X-Original-To: dev-commits-ports-all@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 9E2B11A0720C; Mon, 7 Mar 2022 18:27:28 +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 4KC6Pr1HtNz3h0W; Mon, 7 Mar 2022 18:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646677648; 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=QE4b869yR/i5cixFX6ogdl40wIF6hk0X5W2AS4yiaTY=; b=mLFYRSt9BNJyyF6hCPsKJwGgAFm/UVfdMdMRSltOw9H1zHyS7FhUW9VY0+aeA9T7ZA0eWR WaS0JpSqrrbhdu2lCOoi5E+OHW6pArlQUoKEMqxPK4m7g36YlftEIWTVwPLyKvtdtvYiSZ QeX3Zok4rHaJQ71mqNTOXBdED1Jpz1KIr3MaWx69lVFBIIrdNoVWw7CIfW55897o5T4B56 fJVIVfbOOkSSrBYKBb1WFig0B3cNmVaX7laWQ5PSh4B/ID+T8l8reG+sNSUAYxML4HRRIg xakgRJjll6PrDpNcDL2uAjVjXngMmifDjlN12ZdbiHoHkcjWLrznvpb9XVsUSg== 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 6AFF95911; Mon, 7 Mar 2022 18:27:27 +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 227IRRUp086019; Mon, 7 Mar 2022 18:27:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227IRRVo086018; Mon, 7 Mar 2022 18:27:27 GMT (envelope-from git) Date: Mon, 7 Mar 2022 18:27:27 GMT Message-Id: <202203071827.227IRRVo086018@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: 2c70c255c802 - main - textproc/py-tabletext: Fix build with setuptools 58.0.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 2c70c255c80278ddde5959b1bf0ab7b4fe9cc3af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646677648; 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=QE4b869yR/i5cixFX6ogdl40wIF6hk0X5W2AS4yiaTY=; b=TXzr4wBC5RP3NpLEP1I+5dufqQlW0OfWONXxYXxCAsJeVLZsAJced9bfqH9f4c2LhL8iD4 gDi/4GactqtJv+31jIR6nyst46zUJpbx7QH5jc7bDyyqOxGPuJq4z7R6pHM/7CUKEMrImQ OKTWlfiOoWLo1op7+OvpAi2h/AwUn0UQgdunL6SgU0brdLRcV5cCPMBne6wFrWndrHmPNP hylgZNOuQ7dgGDPTTeaqcSDuIQgXDVJPc4ns1Dzr8+0z3ZZX7duQgwBhYfcj1n7Ah43WvS 0iNcZWLJbK/CgxXV1KyTtu4zk0vs48fpHJiuM3Mouc0eEXGmESDHUDIam3hieg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646677648; a=rsa-sha256; cv=none; b=dYbITrHyxDkryXFcGcXWdWmY1O5DpC7u4os9hLeLXJ4DMWyVLRSrKLm0EdDs3xqiCgck/q h9vCJOmXJqjaWE3VgETFm90knhrNGXAkocwUrLYNFYEc7hEeRsqY58jsT7RNt2MtIscwo0 6lfzNwFLqDVe9/ei5Dh3beYsuydmd4L/uxI4bKsHBYJopccooDaySis2GOidcQgTx97Kj0 qLgqRGJ2JD+P9pQdxKMC3ohJYg+n3cEZ+JhuDub4gkzFHweYMF763GCv+XXBeLvmec62b+ trgR2eLiduT64vA4zuLNGhx5O2//new0R/2kzD8on73iSsxsZTKqGzDH0V3WWA== 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=2c70c255c80278ddde5959b1bf0ab7b4fe9cc3af commit 2c70c255c80278ddde5959b1bf0ab7b4fe9cc3af Author: Po-Chuan Hsieh AuthorDate: 2022-03-07 18:07:58 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-07 18:13:21 +0000 textproc/py-tabletext: Fix build with setuptools 58.0.0+ --- textproc/py-tabletext/files/patch-2to3 | 71 ++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/textproc/py-tabletext/files/patch-2to3 b/textproc/py-tabletext/files/patch-2to3 new file mode 100644 index 000000000000..4d9e86857754 --- /dev/null +++ b/textproc/py-tabletext/files/patch-2to3 @@ -0,0 +1,71 @@ +--- setup.py.orig 2014-08-14 18:05:14 UTC ++++ setup.py +@@ -13,6 +13,5 @@ setup(name='tabletext', + author_email='thibaut.horel+tabletext@gmail.com', + py_modules=['tabletext'], + entry_points={"console_scripts": ["table=tabletext:main"]}, +- use_2to3=True, + license='GNU GPLv3' + ) +--- tabletext.py.orig 2014-08-14 00:50:38 UTC ++++ tabletext.py +@@ -16,20 +16,20 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-from __future__ import unicode_literals ++ + import re + from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter,\ + RawDescriptionHelpFormatter + import sys + from codecs import open, getwriter +-from itertools import izip_longest ++from itertools import zip_longest + + + __all__ = ["to_text"] + + + def _get_widths(table, formats, padding): +- columns = izip_longest(*table, fillvalue="") ++ columns = zip_longest(*table, fillvalue="") + return [max(len(_format_entry(entry, format_string, padding)) + for entry in column) + for column, format_string in zip(columns, formats)] +@@ -63,7 +63,7 @@ def _format_entry(entry, format_string, padding): + def _format_row(row, formats, padding, ver): + return (ver + ver.join(_format_entry(entry, format_string, padding) + for entry, format_string +- in izip_longest(row, formats, fillvalue="")) ++ in zip_longest(row, formats, fillvalue="")) + + ver) + + +@@ -85,7 +85,7 @@ def to_text(table, formats=None, padding=(1, 1), corne + n_columns = max(len(row) for row in table) + if not formats: + formats = [""] * n_columns +- elif type(formats) is unicode: ++ elif type(formats) is str: + formats = [formats] * n_columns + if len(corners) == 1: + corners = corners * 9 +@@ -131,7 +131,7 @@ For more details and bug reports, see: https://github. + default=[1, 1]) + parser.add_argument("--format", help="format string for the table entries", + default="", dest="formats", metavar="FORMAT", +- type=unicode) ++ type=str) + parser.add_argument("--header", help="format first row as header", + action="store_true") + parser.add_argument("--hhor", help="horizontal line character \ +@@ -169,7 +169,7 @@ There is NO WARRANTY, to the extent permitted by law. + del args["sep"] + if sys.version < '3': + sys.stdout = getwriter('utf8')(sys.stdout) +- print to_text(table, **args) ++ print(to_text(table, **args)) + + if __name__ == "__main__": + main()