removed several pre-2.7 methods and imports, including some basic refactorings

1 files changed, 8 insertions, 13 deletions

diff --git a/test/option/profile.py b/test/option/profile.py
index d53c6900..4d6caae6 100644
--- a/test/option/profile.py
+++ b/test/option/profile.py
@@ -24,19 +24,14 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import sys
-try:
-    import io
-    _StringIO = io.StringIO
-except (ImportError, AttributeError):
-    # Pre-2.6 Python has no "io" module.
-    exec('from cStringIO import StringIO')
-else:
-    # 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))
+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))
 
 import TestSCons