From nobody Fri Mar 25 13:50:16 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 C52131A33ED1; Fri, 25 Mar 2022 13:50: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 4KQ3Ph3tm7z3RD5; Fri, 25 Mar 2022 13:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216217; 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=pdQlaSRzzLCZWLOzM2ixzMxCU0R2sS2qNrDXaBcssBo=; b=JLlYbCe9vGFErFOzgQ6VGrXeYpQ7UfaFXSDHtq/AIeItpPZpVRm5rI+QpFQz1BMMU8zNAL wfNdEZ2pis/kE3ERDXBLJ0JdRM9EH1PI0S3QvG592j1Ue7EXg2Rc140IBLygPwaI2TDBbh leJo5PmPoPvlpFYpiXF579g9zXyriRMArIfu37DHMkV5WCm58Bw4mfocsvbpNN7LnVY5hn 3dJ/s09QJE4ZnBaFCsU0Cfe3rfu4oqpDE8yW1sPcfF9CRCslbu/sttg+ZiyrJ8zRRcIsez 26VD7cObvOWmpJGChlce5eNgHAYOFT77tUvcQrDwBhAW0x2a/hsr8j75hZs05w== 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 263145984; Fri, 25 Mar 2022 13:50:16 +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 22PDoGF2033954; Fri, 25 Mar 2022 13:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDoGZe033947; Fri, 25 Mar 2022 13:50:16 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:16 GMT Message-Id: <202203251350.22PDoGZe033947@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: 91a7bf842693 - main - devel/py-urlimport: 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: 91a7bf842693a150e4ad48e892dccda05c4fc119 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216217; 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=pdQlaSRzzLCZWLOzM2ixzMxCU0R2sS2qNrDXaBcssBo=; b=VTPolvE1sdMsZEBcsFqQSZt23Bzr6D8Gl5/Khznbvg0Bko7t8jmJH4QKOETxk8MvkPTcUn DeUVc8KWrKPsQ6lxzV06Vn2ZZIGg3yotwEhGXkm8FOeLjyhzfLgQrPrAUaIdESvwPMPJlG RcI1YAGDe6IrBPaaIsl6nCpz6AQW0O3v9A4tmNT2dCzdd17If4ORx7noL3vVPqAKP+tqEF +vOcbvhsCfTCOjyAD79S+jridT8fvZb6L6iYForcIZRmcTdx/MnKSSNy4D77m8TXYSKeRP exlkD6Oh3DFbuM23XL/3Oj8IW0EY2FknwyteP0BNQx1uHYYH4T969E9bT+xfbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216217; a=rsa-sha256; cv=none; b=HwSE9UgwKVYDBGV7ia+2i63iW5j5JP5WBGOFnfCh0DoDVuH+dA/WGbnqZXHeuVcn3HwkXL /pzogDFIxlf5fW4N2Hz49BcVvAejiZMf3jh9xvxzfUG9GgWC7406j1ZtYLH8cutr/zjwKk DwbqFA2Ori3tcXQuRslAL5xaBf0l/BIOUZHELsI6LHzjWo+jmwJofDkejT0qyqGYvDlktd WBO/NYlJU+g1GAkg6gsnlokEnJ0qg5QXdKtGb0BCM56i5PZ6aGDFxZ0nH6QWAOL2j7PJKF 9er4EsYn6d3dsXq+mDP4Kz7BWJlVLzp2mJm00DA/47kVoAYhHf4ZewiU7O7avg== 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=91a7bf842693a150e4ad48e892dccda05c4fc119 commit 91a7bf842693a150e4ad48e892dccda05c4fc119 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:26 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:12 +0000 devel/py-urlimport: Fix build with setuptools 58.0.0+ With hat: python --- devel/py-urlimport/files/patch-2to3 | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/devel/py-urlimport/files/patch-2to3 b/devel/py-urlimport/files/patch-2to3 new file mode 100644 index 000000000000..4397764790a7 --- /dev/null +++ b/devel/py-urlimport/files/patch-2to3 @@ -0,0 +1,68 @@ +--- urlimport.py.orig 2022-03-18 17:06:46 UTC ++++ urlimport.py +@@ -34,7 +34,7 @@ settings = sys.__dict__.setdefault( + + def debug(s, pf='| |', lvl=1): + if lvl <= settings.get('debug'): +- print "%s %s" % (pf, s) ++ print("%s %s" % (pf, s)) + + class UrlFinder: + def __init__(self, path): +@@ -60,7 +60,7 @@ class UrlFinder: + (self.path + fullname + '/__init__.py', self.path + fullname + '/')]: + try: + source = self.get_source(url) +- except Exception, e: ++ except Exception as e: + debug("find_module: failed to get '%s'. (%s)" % (url, e), lvl=3) + else: + debug("find_module: got '%s'." % url, lvl=1) +@@ -71,7 +71,7 @@ class UrlFinder: + def get_source(self, url): + """Download the source from given url. + """ +- from urllib2 import urlopen ++ from urllib.request import urlopen + + src = '' + +@@ -85,9 +85,9 @@ class UrlFinder: + + if proto == 'https' and cert: + # handle http over ssl with client certificate +- import httplib ++ import http.client + +- conn = httplib.HTTPSConnection( ++ conn = http.client.HTTPSConnection( + host=host, + port=port, + key_file=key, +@@ -98,7 +98,7 @@ class UrlFinder: + conn.endheaders() + response = conn.getresponse() + if response.status != 200: +- raise StandardError, "HTTPS Error: %d"%response.status ++ raise Exception("HTTPS Error: %d"%response.status) + src = response.read() + else: + # handle everything else +@@ -131,7 +131,7 @@ class UrlLoader: + + debug("load_module: executing %s's source..." % fullname, lvl=2) + +- exec self.source in mod.__dict__ ++ exec(self.source, mod.__dict__) + + mod = sys.modules[fullname] + return mod +@@ -142,7 +142,7 @@ def config(**kwargs): + config() - Display settings. + """ + settings.update(kwargs) +- for k,v in (kwargs or settings).iteritems(): ++ for k,v in (kwargs or settings).items(): + debug(" "+str(k)+"="+repr(v), lvl=0 ) + + # register The Hook