>From 1406720107ef807aed764b47feba8e023e085daf Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Thu, 29 Jan 2015 10:32:23 +0100 Subject: [PATCH 4/5] sbus_codegen: Port to python3 Resolves: https://fedorahosted.org/sssd/ticket/2017 --- src/sbus/sbus_codegen | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/sbus/sbus_codegen b/src/sbus/sbus_codegen index d2de58552b8de5bc6178e7a895d3494515680112..a51b323eb4684bf80c424712c5ea19a8d341483c 100755 --- a/src/sbus/sbus_codegen +++ b/src/sbus/sbus_codegen @@ -60,14 +60,19 @@ # to generate for a given interface or method. By default the codegen will # build up a symbol name from the DBus name. # +from __future__ import print_function import optparse import os import re -import StringIO import sys import xml.parsers.expat +if sys.version_info[0] > 2: + import io +else: + import StringIO as io + # ----------------------------------------------------------------------------- # Objects @@ -767,11 +772,11 @@ class DBusXMLParser: try: with open(filename, "r") as f: parser.ParseFile(f) - except DBusXmlException, ex: + except DBusXmlException as ex: ex.line = parser.CurrentLineNumber ex.file = filename raise - except xml.parsers.expat.ExpatError, ex: + except xml.parsers.expat.ExpatError as ex: exc = DBusXmlException(str(ex)) exc.line = ex.lineno exc.file = filename @@ -895,11 +900,11 @@ def parse_options(): (options, args) = parser.parse_args() if not args: - print >> sys.stderr, "sbus_codegen: no input file specified" + print("sbus_codegen: no input file specified", file=sys.stderr) sys.exit(2) if options.mode not in ["header", "source"]: - print >> sys.stderr, "sbus_codegen: specify --mode=header or --mode=source" + print("sbus_codegen: specify --mode=header or --mode=source", file=sys.stderr) return options, args @@ -907,7 +912,7 @@ def main(): options, args = parse_options() if options.output: - sys.stdout = buf = StringIO.StringIO() + sys.stdout = buf = io.StringIO() for filename in args: parser = DBusXMLParser(filename) @@ -928,6 +933,6 @@ def main(): if __name__ == "__main__": try: main() - except DBusXmlException, ex: - print >> sys.stderr, str(ex) + except DBusXmlException as ex: + print(str(ex), file=sys.stderr) sys.exit(1) -- 2.1.0