summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-05-19 02:09:05 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2016-05-19 02:09:05 (GMT)
commitb763362d906af8e23409a1f5d3dc782b0ca3cc91 (patch)
tree3a20ad9832304ffff67fb84f043c0b4581acb9e0
parentb82c5013931763515c74c20c0b7743b451a642cb (diff)
downloadSCons-b763362d906af8e23409a1f5d3dc782b0ca3cc91.zip
SCons-b763362d906af8e23409a1f5d3dc782b0ca3cc91.tar.gz
SCons-b763362d906af8e23409a1f5d3dc782b0ca3cc91.tar.bz2
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 974841c..66120e4 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: