summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-05-18 19:09:05 -0700
committerWilliam Deegan <bill@baddogconsulting.com>2016-05-18 19:09:05 -0700
commit6bb413cf5a8b31070a2832443e8eecc0a49eafc0 (patch)
tree3a20ad9832304ffff67fb84f043c0b4581acb9e0
parent084cba9d9322acb3f8f9accdc1d8c11a6cae3500 (diff)
downloadscons-6bb413cf5a8b31070a2832443e8eecc0a49eafc0.tar.gz
Fix py2/3 StringIO import
-rw-r--r--src/engine/SCons/Script/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 974841c6..66120e40 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -41,7 +41,12 @@ start_time = time.time()
import collections
import os
-import StringIO
+
+try:
+ from StringIO import StringIO
+except ImportError:
+ from io import StringIO
+
import sys
# Special chicken-and-egg handling of the "--debug=memoizer" flag: