From nobody Fri Mar 25 13:50:53 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 4238D1A345F3; Fri, 25 Mar 2022 13:50:55 +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 4KQ3QQ5d1kz3h7c; Fri, 25 Mar 2022 13:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216255; 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=4ge3U2eKqc4aJ6Pd1WQLLm79WmTsSRYwPjibidpwfoc=; b=nW0tOy517EE7wvA2W5U+xVPR7+5fsVd14mIFi+F7mEIpM1uhVn3blDr7wwoopHJ8i6H28I wLfIhsW7IPCIOqawqsgF/kixTKURZVMN80YpWGI2CMniszKfE47Bn09zDBmiklsv0Z9tHm kQyQ9nCMfeOeDwaO70rf531W6pcy4jLdKWlmD9O/23qUtAgCDeeCLYLbL8yIfRr4YmUWu1 YyNgU0rDbphhs0MCOBHMAfe8ObBIusZ00O6SrXHu0sOw/dHIAnGP1Ap51TGMQqOSJXx7Hf bwr3uwO5H97vTBkC+zn+UgYwpSKjPG3cYauzNC8m6F05buGpffA0ia+zl866yQ== 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 5CC6B598B; Fri, 25 Mar 2022 13:50:53 +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 22PDorDU037537; Fri, 25 Mar 2022 13:50:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDorNg037536; Fri, 25 Mar 2022 13:50:53 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:53 GMT Message-Id: <202203251350.22PDorNg037536@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: e4b417e3be07 - main - security/py-cerealizer: 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: e4b417e3be07475addc65bd4981ded03a730cdbb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216255; 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=4ge3U2eKqc4aJ6Pd1WQLLm79WmTsSRYwPjibidpwfoc=; b=Atl89cMcvtS4gM+93+MYNf5+RGVyi4O8y5oJZh9bF6908SygbyIVJg0SZX/QTHgxQhozg3 rNsh1s+el9Z0ljtOxSa31Dq5cwQejOE4/8Jcl5HpqTP0ozf2jEplPeNL41fpL1KSiK3ub4 xtZErZBgXXA9kVBgmC/IlB921070X+wL57iw92AYYlqvw/NWsSAHXt/FewHRy+NGMnEdza 7XXwrLLdSQyZQTge6IakeUUYg7qqiaGseTgGEd6CVLytrCNdaVhi/CflouWnl5fuXbDUeB MN5egWAvM9dXhw5+2LfQL9HioJ37F0ckDr/v6qgohT+cl00K33BGUcmuyfBGmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216255; a=rsa-sha256; cv=none; b=Di7TjgXcdJRYSRyCyfQV46kDrxfCGPmttcT67OOy1S717g/IIw4L32JkKaHPH+8UA1zIkt +BnMltPGG2RVRtdjrFchYfghuU4cbgJSvB8EDAN+7PFNNObNpP6zqfO0WGGrk3Uv19JFrf npNePvJDp7vQdE+wc5uwwcgOHX7OUu4d1J9Ndn3dyai6KwxHPfUn3V4ib37bjJP7RxNC0q FcvXnRBALx9OKfJ1ZfqfKs2goIeAqXrWQES9J7qJSR2sHvH36W3FBUvE9e+Q/QT4k28tkv H+Pb1Mr2kdoxpVerTOGHXDnflJnwvO+Tr0ZdyK5Zp+LIe2bx20Ow3eumtImdlA== 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=e4b417e3be07475addc65bd4981ded03a730cdbb commit e4b417e3be07475addc65bd4981ded03a730cdbb Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:33:54 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:20 +0000 security/py-cerealizer: Fix build with setuptools 58.0.0+ With hat: python --- security/py-cerealizer/files/patch-2to3 | 98 +++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/security/py-cerealizer/files/patch-2to3 b/security/py-cerealizer/files/patch-2to3 new file mode 100644 index 000000000000..e6dc7b618ead --- /dev/null +++ b/security/py-cerealizer/files/patch-2to3 @@ -0,0 +1,98 @@ +--- __init__.py.orig 2008-06-29 21:52:17 UTC ++++ __init__.py +@@ -123,12 +123,12 @@ import logging + logger = logging.getLogger("cerealizer") + #logging.basicConfig(level=logging.INFO) + +-from cStringIO import StringIO ++from io import StringIO + from new import instance + +-class EndOfFile(StandardError): pass +-class NotCerealizerFileError(StandardError): pass +-class NonCerealizableObjectError(StandardError): pass ++class EndOfFile(Exception): pass ++class NotCerealizerFileError(Exception): pass ++class NonCerealizableObjectError(Exception): pass + + def _priority_sorter(a, b): return cmp(a[0], b[0]) + +@@ -206,7 +206,7 @@ Reads a reference from file S.""" + elif c == "r": return self.id2obj[int(s.readline())] + elif c == "n": return None + elif c == "b": return bool(int(s.read(1))) +- elif c == "l": return long(s.readline()) ++ elif c == "l": return int(s.readline()) + elif c == "c": return complex(s.readline()) + raise ValueError("Unknown ref code '%s'!" % c) + +@@ -357,13 +357,13 @@ class DictHandler(Handler): + classname = "dict\n" + def collect(self, obj, dumper): + if Handler.collect(self, obj, dumper): +- for i in obj.iterkeys (): dumper.collect(i) # Collect is not ordered +- for i in obj.itervalues(): dumper.collect(i) ++ for i in obj.keys (): dumper.collect(i) # Collect is not ordered ++ for i in obj.values(): dumper.collect(i) + return 1 + + def dump_data(self, obj, dumper, s): + s.write("%s\n" % len(obj)) +- for k, v in obj.iteritems(): ++ for k, v in obj.items(): + _HANDLERS_[v.__class__].dump_ref(v, dumper, s) # Value is saved fist + _HANDLERS_[k.__class__].dump_ref(k, dumper, s) + +@@ -509,16 +509,16 @@ have to write a custom Handler or a __getstate__ and _ + + CLASSNAME is the classname used in Cerealizer files. It defaults to the full classname (module.class) + but you may choose something shorter -- as long as there is no risk of name clash.""" +- if not _configurable: raise StandardError("Cannot register new classes after freeze_configuration has been called!") ++ if not _configurable: raise Exception("Cannot register new classes after freeze_configuration has been called!") + if "\n" in classname: raise ValueError("CLASSNAME cannot have \\n (Cerealizer automatically add a trailing \\n for performance reason)!") + if not handler: + if hasattr(Class, "__getnewargs__" ): handler = NewArgsObjHandler (Class, classname) + elif hasattr(Class, "__getinitargs__"): handler = InitArgsObjHandler(Class, classname) + elif hasattr(Class, "__slots__" ): handler = SlotedObjHandler (Class, classname) + else: handler = ObjHandler (Class, classname) +- if _HANDLERS_.has_key(Class): raise ValueError("Class %s has already been registred!" % Class) ++ if Class in _HANDLERS_: raise ValueError("Class %s has already been registred!" % Class) + if not isinstance(handler, RefHandler): +- if _HANDLERS .has_key(handler.classname): raise ValueError("A class has already been registred under the name %s!" % handler.classname[:-1]) ++ if handler.classname in _HANDLERS: raise ValueError("A class has already been registred under the name %s!" % handler.classname[:-1]) + _HANDLERS [handler.classname] = handler + if handler.__class__ is ObjHandler: + logger.info("Registring class %s as '%s'" % (Class, handler.classname[:-1])) +@@ -544,7 +544,7 @@ and you'll be able to open old files containing OldCla + handler = _HANDLERS_.get(Class) + if not handler: + raise ValueError("Cannot register alias '%s' to Class %s: the class is not yet registred!" % (alias, Class)) +- if _HANDLERS.has_key(alias): ++ if alias in _HANDLERS: + raise ValueError("Cannot register alias '%s' to Class %s: another class is already registred under the alias name!" % (alias, Class)) + logger.info("Registring alias '%s' for %s" % (alias, Class)) + _HANDLERS[alias + "\n"] = handler +@@ -563,10 +563,10 @@ unexpected calls to register().""" + + register(type(None), NoneHandler ()) + register(str , StrHandler ()) +-register(unicode , UnicodeHandler ()) ++register(str , UnicodeHandler ()) + register(bool , BoolHandler ()) + register(int , IntHandler ()) +-register(long , LongHandler ()) ++register(int , LongHandler ()) + register(float , FloatHandler ()) + register(complex , ComplexHandler ()) + register(dict , DictHandler ()) +@@ -613,8 +613,8 @@ def dump_class_of_module(*modules): + Utility function; for each classes found in the given module, print the needed call to register.""" + class D: pass + class O(object): pass +- s = set([c for module in modules for c in module.__dict__.values() if isinstance(c, type(D)) or isinstance(c, type(O))]) ++ s = set([c for module in modules for c in list(module.__dict__.values()) if isinstance(c, type(D)) or isinstance(c, type(O))]) + l = ['cerealizer.register(%s.%s)' % (c.__module__, c.__name__) for c in s] + l.sort() +- for i in l: print i ++ for i in l: print(i) +