diff options
author | Clint Byrum <clint@fewbar.com> | 2015-05-15 10:52:33 -0700 |
---|---|---|
committer | Clint Byrum <clint@fewbar.com> | 2015-05-15 11:52:15 -0700 |
commit | 99911f6c4c7d51071f70709e55fabcd2e6853284 (patch) | |
tree | 9ae82d0d6c11e05bd9bd152c94993d21f744b252 /tools | |
parent | 4ef44631df5426e0b4808b1c79b51a37eb026a76 (diff) | |
download | pysaml2-99911f6c4c7d51071f70709e55fabcd2e6853284.tar.gz |
Fix python3 syntax errors
Retains python2.7 compatibility for all files. Fixes only syntax errors,
tests still fail on python3 for various reasons.
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/make_metadata.py | 4 | ||||
-rwxr-xr-x | tools/mdexport.py | 2 | ||||
-rwxr-xr-x | tools/mdexport_test.py | 2 | ||||
-rwxr-xr-x | tools/mdimport.py | 4 | ||||
-rwxr-xr-x | tools/merge_metadata.py | 2 | ||||
-rwxr-xr-x | tools/parse_xsd2.py | 140 | ||||
-rwxr-xr-x | tools/sync_attrmaps.py | 6 | ||||
-rwxr-xr-x | tools/verify_metadata.py | 2 |
8 files changed, 81 insertions, 81 deletions
diff --git a/tools/make_metadata.py b/tools/make_metadata.py index d9aea502..0a118a67 100755 --- a/tools/make_metadata.py +++ b/tools/make_metadata.py @@ -69,7 +69,7 @@ if args.id: desc, xmldoc = entities_descriptor(eds, valid_for, args.name, args.id, args.sign, secc) valid_instance(desc) - print desc.to_string(nspair) + print(desc.to_string(nspair)) else: for eid in eds: if args.sign: @@ -81,4 +81,4 @@ else: valid_instance(eid) xmldoc = metadata_tostring_fix(eid, nspair, xmldoc) - print xmldoc + print(xmldoc) diff --git a/tools/mdexport.py b/tools/mdexport.py index 92b76d09..189ced2c 100755 --- a/tools/mdexport.py +++ b/tools/mdexport.py @@ -73,4 +73,4 @@ if metad is not None: f.write(txt) f.close() else: - print txt + print(txt) diff --git a/tools/mdexport_test.py b/tools/mdexport_test.py index bace10d8..19ef443c 100755 --- a/tools/mdexport_test.py +++ b/tools/mdexport_test.py @@ -65,7 +65,7 @@ def main(): if metad: metad.load() - print metad.dumps() + print(metad.dumps()) if __name__ == '__main__': diff --git a/tools/mdimport.py b/tools/mdimport.py index 4c238ed6..f9d62e35 100755 --- a/tools/mdimport.py +++ b/tools/mdimport.py @@ -35,7 +35,7 @@ for i in range(1, 10): _ = mdmd.keys() -print time.time() - start +print(time.time() - start) start = time.time() for i in range(1, 10): @@ -44,4 +44,4 @@ for i in range(1, 10): mdf.load() _ = mdf.keys() -print time.time() - start +print(time.time() - start) diff --git a/tools/merge_metadata.py b/tools/merge_metadata.py index 401dcff6..f5c38f79 100755 --- a/tools/merge_metadata.py +++ b/tools/merge_metadata.py @@ -98,6 +98,6 @@ for line in open(args.conf).readlines(): mds.metadata[spec[1]] = metad -print mds.dumps(args.output) +print(mds.dumps(args.output)) diff --git a/tools/parse_xsd2.py b/tools/parse_xsd2.py index e51671ef..b1c536fe 100755 --- a/tools/parse_xsd2.py +++ b/tools/parse_xsd2.py @@ -835,9 +835,9 @@ def _spec(elem): def _do_from_string(name): print - print "def %s_from_string(xml_string):" % pyify(name) - print "%sreturn saml2.create_class_from_xml_string(%s, xml_string)" % ( - INDENT, name) + print("def %s_from_string(xml_string):" % pyify(name)) + print("%sreturn saml2.create_class_from_xml_string(%s, xml_string)" % ( + INDENT, name)) def _namespace_and_tag(obj, param, top): try: @@ -898,7 +898,7 @@ class Attribute(Simple): # default, fixed, use, type if DEBUG: - print "#ATTR", self.__dict__ + print("#ATTR", self.__dict__) external = False name = "" @@ -971,7 +971,7 @@ class Attribute(Simple): pass if DEBUG: - print "#--ATTR py_attr:%s" % (objekt,) + print("#--ATTR py_attr:%s" % (objekt,)) return objekt @@ -1077,8 +1077,8 @@ class Complex(object): return self._own, self._inherited if DEBUG: - print self.__dict__ - print "#-- %d parts" % len(self.parts) + print(self.__dict__) + print("#-- %d parts" % len(self.parts)) self._extend(top, sup, argv, parent) @@ -1094,7 +1094,7 @@ class Complex(object): # string = "== %s (%s)" % (self.name,self.__class__) # except AttributeError: # string = "== (%s)" % (self.__class__,) - # print string + # print(string) for part in self.parts: if isinstance(part, Element): res.append(name_or_ref(part, top)) @@ -1168,8 +1168,8 @@ class Element(Complex): try: argv_copy = sd_copy(argv) return [self.repr(top, sup, argv_copy, parent=parent)], [] - except AttributeError, exc: - print "#!!!!", exc + except AttributeError as exc: + print("#!!!!", exc) return [], [] def elements(self, top): @@ -1197,9 +1197,8 @@ class Element(Complex): myname = "" if DEBUG: - print "#Element.repr '%s' (child=%s) [%s]" % (myname, - child, - self._generated) + print("#Element.repr '%s' (child=%s) [%s]" % + (myname, child, self._generated)) self.py_class = objekt = PyElement(myname, root=top) min_max(self, objekt, argv) @@ -1214,9 +1213,9 @@ class Element(Complex): objekt.ref = superkl else: objekt.ref = (namespace, superkl) - except AttributeError, exc: + except AttributeError as exc: if DEBUG: - print "#===>", exc + print("#===>", exc) typ = self.type @@ -1257,7 +1256,7 @@ class Element(Complex): objekt.scoped = True else: if DEBUG: - print "$", self + print("$", self) raise if parent: @@ -1310,7 +1309,7 @@ class Sequence(Complex): argv_copy[key] = val if DEBUG: - print "#Sequence: %s" % argv + print("#Sequence: %s" % argv) return Complex.collect(self, top, sup, argv_copy, parent) @@ -1336,7 +1335,7 @@ class Extension(Complex): return self._own, self._inherited if DEBUG: - print "#!!!", self.__dict__ + print("#!!!", self.__dict__) try: base = self.base @@ -1346,14 +1345,14 @@ class Extension(Complex): cti = get_type_def(tag, top.parts) if not cti.py_class: cti.repr(top, sup) - #print "#EXT..",ct._collection + #print("#EXT..",ct._collection) self._inherited = cti.py_class.properties[0][:] self._inherited.extend(cti.py_class.properties[1]) elif self.xmlns_map[namespace] == XMLSCHEMA: base = tag else: iattr = _import_attrs(top.modul[namespace], tag, top) - #print "#EXT..-", ia + #print("#EXT..-", ia) self._inherited = iattr except (AttributeError, ValueError): base = None @@ -1373,7 +1372,7 @@ class Choice(Complex): argv_copy["minOccurs"] = 0 if DEBUG: - print "#Choice: %s" % argv + print("#Choice: %s" % argv) return Complex.collect(self, top, sup, argv_copy, parent=parent) class Restriction(Complex): @@ -1411,11 +1410,11 @@ class ComplexType(Complex): else: new_sup = "%s.%s" % (namespace, name) - #print "#Superior: %s" % new_sup + #print("#Superior: %s" % new_sup) if new_sup: sup = new_sup else: - #print "#>>", self.parts[0].__class__ + #print("#>>", self.parts[0].__class__) pass try: @@ -1473,8 +1472,8 @@ class Group(Complex): "Reference to group in other XSD file, not supported") except KeyError: raise Exception("Missing namespace definition") - except AttributeError, exc: - print "#!!!!", exc + except AttributeError as exc: + print("#!!!!", exc) return [], [] def repr(self, top=None, sup=None, argv=None, _child=True, parent=""): @@ -1615,7 +1614,7 @@ def sort_elements(els): if pres != val: diff = True - #print els + #print(els) partres = [] for key, val in els.items(): if not val: @@ -1645,24 +1644,24 @@ def output(elem, target_namespace, eldict, ignore=None): if prep: done = 1 if isinstance(prep, basestring): - print prep + print(prep) else: for item in prep: - print item - print - print + print(item) + print() + print() if text: done = 1 elem.done = True - print text - print + print(text) + print() return done def intro(): - print """#!/usr/bin/env python + print("""#!/usr/bin/env python # # Generated %s by parse_xsd.py version %s. @@ -1670,7 +1669,7 @@ def intro(): import saml2 from saml2 import SamlBase -""" % (time.ctime(), __version__) +""" % (time.ctime(), __version__)) #NAMESPACE = 'http://www.w3.org/2000/09/xmldsig#' @@ -1759,7 +1758,7 @@ class Schema(Complex): udict[elem] = elem.undefined(eldict) keys = [k.name for k in udict.keys()] - print "#", keys + print("#", keys) res = (None, []) if not udict: return res @@ -1834,19 +1833,19 @@ class Schema(Complex): return undone def _element_from_string(self): - print "ELEMENT_FROM_STRING = {" + print("ELEMENT_FROM_STRING = {") for elem in self.elems: if isinstance(elem, PyAttribute) or isinstance(elem, PyGroup): continue if elem.abstract: continue - print "%s%s.c_tag: %s_from_string," % (INDENT, elem.class_name, - pyify(elem.class_name)) - print "}" - print + print("%s%s.c_tag: %s_from_string," % (INDENT, elem.class_name, + pyify(elem.class_name))) + print("}") + print() def _element_by_tag(self): - print "ELEMENT_BY_TAG = {" + print("ELEMENT_BY_TAG = {") listed = [] for elem in self.elems: if isinstance(elem, PyAttribute) or isinstance(elem, PyGroup): @@ -1854,16 +1853,16 @@ class Schema(Complex): if elem.abstract: continue lcen = elem.name - print "%s'%s': %s," % (INDENT, lcen, elem.class_name) + print("%s'%s': %s," % (INDENT, lcen, elem.class_name)) listed.append(lcen) for elem in self.elems: if isinstance(elem, PyAttribute) or isinstance(elem, PyGroup): continue lcen = elem.name if elem.abstract and lcen not in listed: - print "%s'%s': %s," % (INDENT, lcen, elem.class_name) + print("%s'%s': %s," % (INDENT, lcen, elem.class_name)) listed.append(lcen) - print "}" + print("}") print def out(self): @@ -1884,26 +1883,26 @@ class Schema(Complex): for elem in self.elems: eldict[elem.name] = elem - #print eldict.keys() + #print(eldict.keys()) intro() for modul in self.add: - print "from %s import *" % modul + print("from %s import *" % modul) for _namespace, (mod, namn) in self.impo.items(): if namn: - print "import %s as %s" % (mod, namn) - print - print "NAMESPACE = '%s'" % self.target_namespace + print("import %s as %s" % (mod, namn)) + print( ) + print("NAMESPACE = '%s'" % self.target_namespace) print for defs in self.defs: - print defs + print(defs) print exceptions = [] block = [] while self._do(eldict): - print "#.................." + print("#..................") (objekt, tups) = self.adjust(eldict, block) if not objekt: break @@ -1917,29 +1916,30 @@ class Schema(Complex): block = block_items(objekt, block, eldict) if exceptions: - print "#", 70*'+' + print("#", 70*'+') for line in exceptions: - print line - print "#", 70*'+' + print(line) + print("#", 70*'+') print for attrgrp in self.attrgrp: - print "AG_%s = [" % attrgrp.name + print("AG_%s = [" % attrgrp.name) for prop in attrgrp.properties[0]: if isinstance(prop.type, PyObj): - print "%s('%s', %s_, %s)," % (INDENT, prop.name, - prop.type.name, prop.required) + print("%s('%s', %s_, %s)," % (INDENT, prop.name, + prop.type.name, + prop.required)) else: - print "%s('%s', '%s', %s)," % (INDENT, prop.name, - prop.type, prop.required) - print "]" - print + print("%s('%s', '%s', %s)," % (INDENT, prop.name, + prop.type, prop.required)) + print("]") + print() self._element_from_string() self._element_by_tag() print - print "def factory(tag, **kwargs):" - print " return ELEMENT_BY_TAG[tag](**kwargs)" + print("def factory(tag, **kwargs):") + print(" return ELEMENT_BY_TAG[tag](**kwargs)") print @@ -1991,7 +1991,7 @@ def evaluate(typ, elem): try: return ELEMENTFUNCTION[typ](elem) except KeyError: - print "Unknown type", typ + print("Unknown type", typ) NS_MAP = "xmlns_map" @@ -2015,14 +2015,14 @@ def parse_nsmap(fil): return ElementTree.ElementTree(root) def usage(): - print "Usage: parse_xsd [-i <module:as>] xsd.file > module.py" + print("Usage: parse_xsd [-i <module:as>] xsd.file > module.py") def recursive_find_module(name, path=None): parts = name.split(".") mod_a = None for part in parts: - #print "$$", part, path + #print("$$", part, path) try: (fil, pathname, desc) = imp.find_module(part, path) except ImportError: @@ -2144,9 +2144,9 @@ def main(argv): try: opts, args = getopt.getopt(argv, "a:d:hi:I:s:", ["add=", "help", "import=", "defs="]) - except getopt.GetoptError, err: + except getopt.GetoptError as err: # print help information and exit: - print str(err) # will print something like "option -a not recognized" + print(str(err)) # will print something like "option -a not recognized" usage() sys.exit(2) @@ -2177,12 +2177,12 @@ def main(argv): assert False, "unhandled option" if not args: - print "No XSD-file specified" + print("No XSD-file specified") usage() sys.exit(2) schema = read_schema(args[0], add, defs, impo, modul, ignore, sdir) - #print schema.__dict__ + #print(schema.__dict__) schema.out() if __name__ == "__main__": diff --git a/tools/sync_attrmaps.py b/tools/sync_attrmaps.py index a067d8af..4f0d3b67 100755 --- a/tools/sync_attrmaps.py +++ b/tools/sync_attrmaps.py @@ -58,7 +58,7 @@ class AMap(object): try: assert self.mod.MAP["to"][val] == key except KeyError: # missing value - print "# Added %s=%s" % (self.mod.MAP["to"][val], key) + print("# Added %s=%s" % (self.mod.MAP["to"][val], key)) self.mod.MAP["to"][val] = key except AssertionError: raise Exception("Mismatch key:%s '%s' != '%s'" % ( @@ -66,7 +66,7 @@ class AMap(object): for val in self.mod.MAP["to"].values(): if val not in self.mod.MAP["fro"]: - print "# Missing URN '%s'" % val + print("# Missing URN '%s'" % val) def do_fro(self): txt = ["%s'fro': {" % self.indent] @@ -133,7 +133,7 @@ if __name__ == "__main__": continue elif fname.endswith(".pyc"): continue - print 10 * "=" + fname + 10 * "=" + print(10 * "=" + fname + 10 * "=") amap = AMap(_name, fname, 4 * " ") f = open(fname, "w") f.write("%s" % amap) diff --git a/tools/verify_metadata.py b/tools/verify_metadata.py index d62a1109..da71334c 100755 --- a/tools/verify_metadata.py +++ b/tools/verify_metadata.py @@ -86,7 +86,7 @@ if metad: except: raise else: - print "OK" + print("OK") |