summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-11-19 18:49:06 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2015-11-19 18:49:06 (GMT)
commit20bbea44264012aa96806c661f904b38ba5639d4 (patch)
tree0e20b5dc2c1e1877accf5ea0e9647448706a63e0
parente806691e1e680d003c47ef6212ca7bf74e437c5b (diff)
downloadSCons-20bbea44264012aa96806c661f904b38ba5639d4.zip
SCons-20bbea44264012aa96806c661f904b38ba5639d4.tar.gz
SCons-20bbea44264012aa96806c661f904b38ba5639d4.tar.bz2
remove compat io. python 2.7 supports io
-rw-r--r--src/engine/SCons/compat/__init__.py7
-rw-r--r--src/engine/SCons/compat/_scons_io.py45
2 files changed, 0 insertions, 52 deletions
diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py
index 06cee57..68fb9e4 100644
--- a/src/engine/SCons/compat/__init__.py
+++ b/src/engine/SCons/compat/__init__.py
@@ -105,13 +105,6 @@ except ImportError:
try:
- import io
-except ImportError:
- # Pre-2.6 Python has no io module.
- import_as('_scons_io', 'io')
-
-
-try:
os.devnull
except AttributeError:
# Pre-2.4 Python has no os.devnull attribute
diff --git a/src/engine/SCons/compat/_scons_io.py b/src/engine/SCons/compat/_scons_io.py
deleted file mode 100644
index 538afb7..0000000
--- a/src/engine/SCons/compat/_scons_io.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__doc__ = """
-io compatibility module for older (pre-2.6) Python versions
-
-This does not not NOT (repeat, *NOT*) provide complete io
-functionality. It only wraps the portions of io functionality used
-by SCons, in an interface that looks enough like io for our purposes.
-"""
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-# Use the "imp" module to protect the imports below from fixers.
-import imp
-
-_cStringIO = imp.load_module('cStringIO', *imp.find_module('cStringIO'))
-StringIO = _cStringIO.StringIO
-del _cStringIO
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4: