From nobody Fri Mar 25 13:50:26 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 137801A34287; Fri, 25 Mar 2022 13:50: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 4KQ3Pt6G8Lz3RC7; Fri, 25 Mar 2022 13:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216227; 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=joe2HEj3hKvZN935PhjA5FKDiuHdXaGSzA+mdB9fKWA=; b=e9ZqwIWE0gAmvHTpeBvp5sG1fFCVHM/oWn5TdBjXhCmJukDRPCs/+n9URMYF7GrNCEfbFl KhWR9h/WWxQHYGVTktMyFzrkoDiXvl+n2umN9iJr30OX7OA/Xqb/3TSoHVHg3jfPy6+6EP SGz03LUW8W8BoIMZy/SKIl6Lia5988Dxb6aGJrj0so6YIU3He1Nn87nAQPI3jrdOAUa5Js 0sanoRIgG1Lf/g+Vyu4zm/iAHuc6aHEj+pXU4qDr1MZectS9Xk/L5jdkKWTF3LMqg3D3ik vgJQy9lQB8heaszNx8SkbvKX3LrTl9gwMWtgtbayqAxg7xq9M68l/MeL0FGgJA== 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 324FA5985; Fri, 25 Mar 2022 13:50:26 +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 22PDoQhx036937; Fri, 25 Mar 2022 13:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDoQ0m036936; Fri, 25 Mar 2022 13:50:26 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:26 GMT Message-Id: <202203251350.22PDoQ0m036936@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: 21f093c1d689 - main - devel/py-zope.sequencesort: 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: 21f093c1d6899310fb615430647416a22a2ace1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216227; 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=joe2HEj3hKvZN935PhjA5FKDiuHdXaGSzA+mdB9fKWA=; b=uAIu2wFiWIFQNkvPAbUQhPtIELMRg+kRifMq+7uoIRoQEhsde3WvrbBzppl/y0Th9b5cfg rPaiYyDHZeC30ONzmQVhdasjDQurmCTP53FfAYcFHCt22hTuvlqZ6X1bSKSaRqpqJocQU+ qRQZRf7ujCprlIlHCXUWADeoj0PgKY52tdTKtn7aQHG1DYT6ay05bWJId29auS8QHOx9Vb Pu5ZmNE47BiihJQOzZ8l7fxBWblB5Pzhe5rJ0RLxmdkRuJCbJ5nXWLXBQgmClf1fMqTJEs WBcNTsCew201w0991Ju8KU8qUszr0g2mUZwbloKczptGpVIY916hOlJtAGFcsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216227; a=rsa-sha256; cv=none; b=AwFa/bH9Dyg9Q9KFf65GYEE0tnnq9nc8Nb+wxgY0Z0OfAaaJyd9Hr+N4E9ManBlBq/2MfH pUgX4dbkFI8FsEgvAtpk6aUAgdDnbzAWDML7DFEnazZmJRF6dKMX/e736BUlZhcRjrfGus UnDFU2kfzDkvSa+o6st87N1C3DyfMzjFow0tpxYcw/wY+04JSdE1zNkdOAsRMme9/Vz842 bYGlz7fJrG32e11ecgbEwsdKqVXsjDF85O10SIXcIQfqvh8VKBPz2soS5fXWQl+p5D5NM7 QQ/RCeYCgJ9mt5SyjIxKv46QyP575pTlu12vDQK9GnG42gM19zf77ictATFqKQ== 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=21f093c1d6899310fb615430647416a22a2ace1f commit 21f093c1d6899310fb615430647416a22a2ace1f Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:32 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:15 +0000 devel/py-zope.sequencesort: Fix build with setuptools 58.0.0+ With hat: python --- devel/py-zope.sequencesort/files/patch-2to3 | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/devel/py-zope.sequencesort/files/patch-2to3 b/devel/py-zope.sequencesort/files/patch-2to3 new file mode 100644 index 000000000000..35377d9a7364 --- /dev/null +++ b/devel/py-zope.sequencesort/files/patch-2to3 @@ -0,0 +1,45 @@ +--- src/zope/sequencesort/ssort.py.orig 2007-10-03 03:58:37 UTC ++++ src/zope/sequencesort/ssort.py +@@ -66,13 +66,13 @@ def sort(sequence, sort=(), _=None, mapping=0): + + # clean the mess a bit + if multsort: # More than one sort key. +- sortfields = map(lambda x: x[0], sf_list) ++ sortfields = [x[0] for x in sf_list] + else: + sort = sf_list[0][0] + + elif sort: + if multsort: # More than one sort key. +- sortfields = map(lambda x: x[0], sort) ++ sortfields = [x[0] for x in sort] + else: + sort = sort[0][0] + +@@ -133,7 +133,7 @@ def nocase(str1, str2): + return cmp(str1.lower(), str2.lower()) + + import sys +-if sys.modules.has_key("locale"): # only if locale is already imported ++if "locale" in sys.modules: # only if locale is already imported + from locale import strcoll + + def strcoll_nocase(str1, str2): +@@ -157,7 +157,7 @@ def make_sortfunctions(sortfields, _): + elif l == 3: + pass + else: +- raise SyntaxError, "sort option must contains no more than 2 fields" ++ raise SyntaxError("sort option must contains no more than 2 fields") + + f_name = f[1] + +@@ -184,7 +184,7 @@ def make_sortfunctions(sortfields, _): + elif sort_order == "desc": + multiplier = -1 + else: +- raise SyntaxError, "sort direction must be either ASC or DESC" ++ raise SyntaxError("sort direction must be either ASC or DESC") + + sf_list.append((f[0], func, multiplier)) +