Result of raw 2to3 run (2to3-2.7); checkpoint for python3 conversion.

1 files changed, 14 insertions, 14 deletions

diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py
index dc9d161..453e241 100644
--- a/bin/SConsDoc.py
+++ b/bin/SConsDoc.py
@@ -210,12 +210,12 @@ class Libxml2ValidityHandler:
         
     def error(self, msg, data):
         if data != ARG:
-            raise Exception, "Error handler did not receive correct argument"
+            raise Exception("Error handler did not receive correct argument")
         self.errors.append(msg)
 
     def warning(self, msg, data):
         if data != ARG:
-            raise Exception, "Warning handler did not receive correct argument"
+            raise Exception("Warning handler did not receive correct argument")
         self.warnings.append(msg)
 
 
@@ -332,16 +332,16 @@ if not has_libxml2:
             xmlschema = etree.XMLSchema(xmlschema_context)
             try:
                 doc = etree.parse(fpath)
-            except Exception, e:
-                print "ERROR: %s fails to parse:"%fpath
-                print e
+            except Exception as e:
+                print("ERROR: %s fails to parse:"%fpath)
+                print(e)
                 return False
             doc.xinclude()
             try:
                 xmlschema.assertValid(doc)
-            except Exception, e:
-                print "ERROR: %s fails to validate:" % fpath
-                print e
+            except Exception as e:
+                print("ERROR: %s fails to validate:" % fpath)
+                print(e)
                 return False
             return True
 
@@ -477,8 +477,8 @@ else:
         
             if err or eh.errors:
                 for e in eh.errors:
-                    print e.rstrip("\n")
-                print "%s fails to validate" % fpath
+                    print(e.rstrip("\n"))
+                print("%s fails to validate" % fpath)
                 return False
                 
             return True
@@ -599,7 +599,7 @@ class SConsDocTree:
             # Create xpath context
             self.xpath_context = self.doc.xpathNewContext()
             # Register namespaces
-            for key, val in self.nsmap.iteritems():
+            for key, val in self.nsmap.items():
                 self.xpath_context.xpathRegisterNs(key, val)
             
     def __del__(self):
@@ -637,8 +637,8 @@ def validate_all_xml(dpaths, xsdfile=default_xsd):
     fails = []
     for idx, fp in enumerate(fpaths):
         fpath = os.path.join(path, fp)
-        print "%.2f%s (%d/%d) %s" % (float(idx+1)*100.0/float(len(fpaths)),
-                                     perc, idx+1, len(fpaths),fp)
+        print("%.2f%s (%d/%d) %s" % (float(idx+1)*100.0/float(len(fpaths)),
+                                     perc, idx+1, len(fpaths),fp))
                                               
         if not tf.validateXml(fp, xmlschema_context):
             fails.append(fp)
@@ -810,7 +810,7 @@ def importfile(path):
     file = open(path, 'r')
     try:
         module = imp.load_module(name, file, path, (ext, 'r', kind))
-    except ImportError, e:
+    except ImportError as e:
         sys.stderr.write("Could not import %s: %s\n" % (path, e))
         return None
     file.close()