From nobody Fri Mar 25 13:51:13 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 D2B491A34D85; Fri, 25 Mar 2022 13:51:15 +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 4KQ3Qp37sPz3hND; Fri, 25 Mar 2022 13:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216275; 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=2b2fHWmfmKYaLK9OtIlKNrmuD9wv8gHNa8K5gAGBjE8=; b=fVzQrvXQj73t5r8dMjlwbkNfJdT0D9wMKt3/IrN3mb2KtvSOQ4D+DfOhBWeYgx8/DMSTws QsSxvNwoXtCcfz/sUPdaUv81h0OBPGc/t3MQBCTwQ9Vf66PzEzIdw7V69rAtYVZOm/h5ar oJbMIVEgUrOlPdKD6mTBiccQZqFTJU301XECTdCqShLbRtiieIyPpp+mtyWwNSlgtnsZOL MzsPvkOZSkAjrZb2bi8gmZJDiNKIFkmKlmhi3u2SDBE0s4V4CQ/pe8pzPLIC3WrRIC1Qev YWLqma1zap4J9hzp0dGepiQHd+z4XENUCvFHon6WxmBE2JFpSGfx5W0CGNW1ng== 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 BE9245556; Fri, 25 Mar 2022 13:51:13 +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 22PDpD5S037993; Fri, 25 Mar 2022 13:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDpDxI037992; Fri, 25 Mar 2022 13:51:13 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:51:13 GMT Message-Id: <202203251351.22PDpDxI037992@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: dc3fd5752a36 - main - www/py-dtflickr: 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: dc3fd5752a3682677de91048d19c45f2d70507fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216275; 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=2b2fHWmfmKYaLK9OtIlKNrmuD9wv8gHNa8K5gAGBjE8=; b=k4Ow3UFS4mNhTMatwrqcTfYysVddEbDu0ZGxGMYBNB2uBzCCmB7883d317xcJQAySsjzUp qJW+WQ/rZO6J+8E0KJE/RjCM660/q5JnwzU4JZTg0ZuWGTZpAJ7dE4C+TcpSpF50bKdqOP GYOkrNSTophONgW/TBwThSgSiQfbQTBqhy34hd+mkWBcI3hT/ArBhHk56rpNrm6GoApP4i TSTYtw7wq5/CKpQsWo2sp3xr3Ado72BtjpYALfvlapVmxb0bC75C3Xz6Wwtnp+iMopPsjA S5JONK9Y0il4AuKOekv7bqwIaFvejiG80AuVLBegIAg5Pf5BhTaKXm3onw+uTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216275; a=rsa-sha256; cv=none; b=SEQF/TVuR1gdZqDBMtUWfBOGr1oIM5OFqs7DtyPUcL25IufmCG3B2GY+DIoL0wj+f1X5BM hRRI1WJa/HzHgU8+yU5SxXMh6Ew9KqD1W/I19bacs07zCPQAcK3Ykc3gB5cimeiGL8Revd fUq+FNY0/KuI0X0n6xFWmJ9rW29D+fi4rB05OOXz418C5G2325UWuPDzw8yh1p7qMwr08L 7BwUeTF66oPo1e0uk30aRFHWho/HFrBR01nDucwRf6EzMgeBG5fA0OCpTci+fl2uaru/ZC BvubOwQnS7hphjIFC0IIhU0oyni0WfRBIlqNqi8lYXkkHDyTLaTt7voQGa8E9w== 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=dc3fd5752a3682677de91048d19c45f2d70507fe commit dc3fd5752a3682677de91048d19c45f2d70507fe Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:35:09 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:24 +0000 www/py-dtflickr: Fix build with setuptools 58.0.0+ With hat: python --- www/py-dtflickr/files/patch-2to3 | 103 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/www/py-dtflickr/files/patch-2to3 b/www/py-dtflickr/files/patch-2to3 new file mode 100644 index 000000000000..eb1fc3f77cec --- /dev/null +++ b/www/py-dtflickr/files/patch-2to3 @@ -0,0 +1,103 @@ +--- dtflickr/__init__.py.orig 2009-09-21 01:59:19 UTC ++++ dtflickr/__init__.py +@@ -19,10 +19,10 @@ + # limitations under the License. + + import hashlib +-import _methods ++from . import _methods + import re + import time +-import urllib, urllib2 ++import urllib.request, urllib.parse, urllib.error, urllib.request, urllib.error, urllib.parse + + try: + import simplejson as json +@@ -50,7 +50,7 @@ for namespace, methods in _methods.namespaces: + for method, documentation in methods: + code += ' def ' + method + '(self, **arguments):\n ' + repr(documentation) + '\n return self._execute(\'' + method + '\', **arguments)\n' + +- exec code in globals(), locals() ++ exec(code, globals(), locals()) + + del namespace, methods, method, documentation, code + +@@ -92,19 +92,19 @@ class Flickr: + self.__signature = None + + for namespace, methods in _methods.namespaces: +- exec 'self.' + namespace + ' = ' + _methods.namespace(namespace) + '(self)' ++ exec('self.' + namespace + ' = ' + _methods.namespace(namespace) + '(self)') + + self.__cache = {} + + def _execute(self, method, **arguments): +- for name, value in arguments.iteritems(): +- arguments[name] = unicode(value).encode('utf8') ++ for name, value in arguments.items(): ++ arguments[name] = str(value).encode('utf8') + + arguments['api_key'] = self.__api_key + arguments['format'] = 'json' + arguments['method'] = 'flickr.' + method + arguments['nojsoncallback'] = 1 +- parameters = arguments.items() ++ parameters = list(arguments.items()) + + parameters.sort() + +@@ -112,31 +112,31 @@ class Flickr: + signature = self.__signature.copy() + + for name, value in parameters: +- signature.update(name + unicode(value).encode('utf8')) ++ signature.update(name + str(value).encode('utf8')) + + parameters.append(('api_sig', signature.hexdigest())) + +- parameters = urllib.urlencode(parameters) ++ parameters = urllib.parse.urlencode(parameters) + cached = self.__cache.get(parameters) + + if cached is not None and cached[0] > time.time(): + response = cached[1] + now = time.time() + +- for parameters, cached in self.__cache.items(): ++ for parameters, cached in list(self.__cache.items()): + if cached[0] <= now: + del self.__cache[parameters] + + return response + +- response = json.load(urllib2.urlopen('http://api.flickr.com/services/rest/', parameters), object_hook = Response) ++ response = json.load(urllib.request.urlopen('http://api.flickr.com/services/rest/', parameters), object_hook = Response) + + if response.stat == 'ok': + self.__cache[parameters] = (time.time() + 60, response) + + return response + else: +- raise Failure, response ++ raise Failure(response) + + class Response: + def __init__(self, data): +@@ -158,7 +158,7 @@ class Response: + return self.__data[name] + + def __iter__(self): +- return self.__data.iteritems() ++ return iter(self.__data.items()) + + def __contains__(self, name): + return name in self.__data +@@ -230,7 +230,7 @@ def getBuddyiconURL(person, flickr = None): + flickr (Optional) + A Flickr API instance used to get a person response. + """ +- if isinstance(person, basestring): ++ if isinstance(person, str): + assert flickr is not None and isinstance(flickr, Flickr) + + person = flickr.people.getInfo(user_id = person).person