commit 8a65fccfabc0ba29a3f2e635264941137eeb4f34
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Thu Jun 5 11:05:17 2014 +0200
Make pom_editor python3 compatible
java-utils/pom_editor.py | 14 ++++++++------
test/test_common.py | 4 ++--
test/xml_compare.py | 7 +++----
3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
index 8d9482c..7ec9101 100644
--- a/java-utils/pom_editor.py
+++ b/java-utils/pom_editor.py
@@ -1,4 +1,6 @@
#!/usr/bin/python
+from __future__ import print_function
+
import inspect
import re
import shutil
@@ -160,8 +162,8 @@ def get_indent(node):
return re.sub(r'\S.*', '', text)
def print_usage(function):
- print >> sys.stderr, "Usage: %{name}
{doc}".format(name=function.__name__,
- doc=function.__doc__)
+ print("Usage: %{name} {doc}".format(name=function.__name__,
doc=function.__doc__),
+ file=sys.stderr)
def parse_args(function, args):
(arglist, _, _, defaults) = inspect.getargspec(function)
@@ -414,8 +416,8 @@ def macro(types=(XmlFile,)):
except (PomException, etree.XMLSyntaxError, IOError) as exception:
if xmlpath:
- print >> sys.stderr, "Error in processing
{0}".format(xmlpath)
- print >> sys.stderr, exception.message
+ print("Error in processing {0}".format(xmlpath),
file=sys.stderr)
+ print(exception.message, file=sys.stderr)
print_usage(function)
sys.exit(3)
@@ -553,8 +555,8 @@ def pom_change_dep(old, new, pom=None, xml_string=''):
if __name__ == '__main__':
if len(sys.argv) <= 1:
- print >> sys.stderr, "Usage:\n\t{0} command {{arguments}}"\
- .format(sys.argv[0])
+ print("Usage:\n\t{0} command {{arguments}}".format(sys.argv[0]),
+ file=sys.stderr)
sys.exit(1)
macros[sys.argv[1]](*sys.argv[2:])
diff --git a/test/test_common.py b/test/test_common.py
index ae90945..1b4094f 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -231,12 +231,12 @@ def exec_pom_macro(line, poms_tree, want_tree=None,
filename='pom.xml'):
DATADIR = path.join(DIRPATH, 'data', 'pom_editor')
pack = Package('test')
pack.append_to_prep(line)
- for destpath, sourcepath in poms_tree.iteritems():
+ for destpath, sourcepath in poms_tree.items():
pack.add_source(path.join(DATADIR, sourcepath), path.join(destpath, filename))
_, stderr, return_value = pack.run_prep()
reports = []
if return_value == 0:
- for filepath, pom in poms_tree.iteritems():
+ for filepath, pom in poms_tree.items():
if want_tree and filepath in want_tree:
expected_pom = path.join('want', want_tree[filepath])
else:
diff --git a/test/xml_compare.py b/test/xml_compare.py
index aac7190..635b834 100644
--- a/test/xml_compare.py
+++ b/test/xml_compare.py
@@ -34,7 +34,7 @@ def compare_lxml_etree(doc1, doc2, unordered=None):
_strip_comments(doc2)
lines = []
- for sgn, line in _compare_element(doc1, doc2, unordered_paths = paths):
+ for sgn, line in _compare_element(doc1, doc2, unordered_paths=paths):
lines.append('{sgn}{line}'.format(sgn=sgn, line=line))
return '\n'.join(lines)
@@ -241,8 +241,7 @@ def _compare_attrs(exp, act):
if __name__ == '__main__':
if len(sys.argv) < 3:
- print ('Usage {name} filexp filact ' +
+ print('Usage {name} filexp filact ' +
'[unordered_elements path specification]').format(name=sys.argv[0])
sys.exit(1)
- print compare_xml_files(sys.argv[1], sys.argv[2], sys.argv[3:])
-
+ print(compare_xml_files(sys.argv[1], sys.argv[2], sys.argv[3:]))