http://scons.tigris.org/issues/show_bug.cgi?id=2345

Apply all the remaining changes from the fixers.

1 files changed, 8 insertions, 4 deletions

diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index 922ddd6..b8b1238 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -10,12 +10,16 @@
 # and/or .mod files contining the ENTITY definitions for each item,
 # or in man-page-formatted output.
 #
+import os
+import sys
 import getopt
-import os.path
 import re
-import StringIO
-import sys
 import xml.sax
+try:
+    from io import StringIO
+except ImportError:
+    # No 'io' module or no StringIO in io
+    exec('from cStringIO import StringIO')
 
 import SConsDoc
 
@@ -100,7 +104,7 @@ for f in args:
         content = content.replace('-->\n', '-->')
         input = xml_preamble + content + xml_postamble
         try:
-            saxparser.parse(StringIO.StringIO(input))
+            saxparser.parse(StringIO(input))
         except:
             sys.stderr.write("error in %s\n" % f)
             raise