Fix name shadowing trap brought to light by py3s changes in module import see: http://python-notes.curiousefficiency.org/en/latest/python_concepts/import_traps.html#the-name-shadowing-trap

1 files changed, 12 insertions, 8 deletions

diff --git a/test/option/profile.py b/test/option/option_profile.py
index 4d942cf2..cb9d22c7 100644
--- a/test/option/profile.py
+++ b/test/option/option_profile.py
@@ -25,14 +25,18 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import sys
-import io
-_StringIO = io.StringIO
-# TODO(2.6):  In 2.6 and beyond, the io.StringIO.write() method
-# requires unicode strings.  This subclass can probably be removed
-# when we drop support for Python 2.6.
-class StringIO(_StringIO):
-    def write(self, s):
-        _StringIO.write(self, unicode(s))
+
+if sys.version_info[0] < 3:
+    import io
+    _StringIO = io.StringIO
+    # TODO(2.6):  In 2.6 and beyond, the io.StringIO.write() method
+    # requires unicode strings.  This subclass can probably be removed
+    # when we drop support for Python 2.6.
+    class StringIO(_StringIO):
+        def write(self, s):
+            _StringIO.write(self, unicode(s))
+else:
+    from io import StringIO
 
 import TestSCons