1*4882a593Smuzhiyungconf: use python3 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunConvert gsettings-schema-convert to use python3. 4*4882a593Smuzhiyun 5*4882a593SmuzhiyunUpstream-Status: Inappropriate [gconf is deprecated] 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunSigned-off-by: Joe Slater <joe.slater@windriver.com> 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun 10*4882a593Smuzhiyun--- a/gsettings/gsettings-schema-convert 11*4882a593Smuzhiyun+++ b/gsettings/gsettings-schema-convert 12*4882a593Smuzhiyun@@ -1,4 +1,4 @@ 13*4882a593Smuzhiyun-#!/usr/bin/env python 14*4882a593Smuzhiyun+#!/usr/bin/env python3 15*4882a593Smuzhiyun # vim: set ts=4 sw=4 et: coding=UTF-8 16*4882a593Smuzhiyun # 17*4882a593Smuzhiyun # Copyright (c) 2010, Novell, Inc. 18*4882a593Smuzhiyun@@ -603,7 +603,7 @@ class SimpleSchemaParser: 19*4882a593Smuzhiyun for line in lines: 20*4882a593Smuzhiyun current_line_nb += 1 21*4882a593Smuzhiyun self.parse_line(line) 22*4882a593Smuzhiyun- except GSettingsSchemaConvertException, e: 23*4882a593Smuzhiyun+ except GSettingsSchemaConvertException as e: 24*4882a593Smuzhiyun raise GSettingsSchemaConvertException('%s:%s: %s' % (os.path.basename(self.file), current_line_nb, e)) 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun return self.root 27*4882a593Smuzhiyun@@ -1095,7 +1095,7 @@ def main(args): 28*4882a593Smuzhiyun try: 29*4882a593Smuzhiyun parser = GConfSchemaParser(argfile, options.gettext_domain, options.schema_id, options.keep_underscores) 30*4882a593Smuzhiyun schema_root = parser.parse() 31*4882a593Smuzhiyun- except SyntaxError, e: 32*4882a593Smuzhiyun+ except SyntaxError as e: 33*4882a593Smuzhiyun raise GSettingsSchemaConvertException('\'%s\' does not look like a valid gconf schema file: %s' % (argfile, e)) 34*4882a593Smuzhiyun else: 35*4882a593Smuzhiyun # autodetect if file is XML or not 36*4882a593Smuzhiyun@@ -1104,7 +1104,7 @@ def main(args): 37*4882a593Smuzhiyun schema_root = parser.parse() 38*4882a593Smuzhiyun if not options.simple and not options.xml: 39*4882a593Smuzhiyun options.simple = True 40*4882a593Smuzhiyun- except SyntaxError, e: 41*4882a593Smuzhiyun+ except SyntaxError as e: 42*4882a593Smuzhiyun parser = SimpleSchemaParser(argfile) 43*4882a593Smuzhiyun schema_root = parser.parse() 44*4882a593Smuzhiyun if not options.simple and not options.xml: 45*4882a593Smuzhiyun@@ -1127,13 +1127,13 @@ def main(args): 46*4882a593Smuzhiyun fout = open(options.output, 'w') 47*4882a593Smuzhiyun fout.write(output) 48*4882a593Smuzhiyun fout.close() 49*4882a593Smuzhiyun- except GSettingsSchemaConvertException, e: 50*4882a593Smuzhiyun+ except GSettingsSchemaConvertException as e: 51*4882a593Smuzhiyun fout.close() 52*4882a593Smuzhiyun if os.path.exists(options.output): 53*4882a593Smuzhiyun os.unlink(options.output) 54*4882a593Smuzhiyun raise e 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun- except GSettingsSchemaConvertException, e: 57*4882a593Smuzhiyun+ except GSettingsSchemaConvertException as e: 58*4882a593Smuzhiyun print >> sys.stderr, '%s' % e 59*4882a593Smuzhiyun return 1 60*4882a593Smuzhiyun 61