Evaluate compat module transparently when SCons is instantiated

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3387 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index 45bd99a1e947ed4209e8e9d3474d00da1738e74f..977bdeaf03cfdabcbe50e8063ee306f8cae52991 100644 (file)
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -100,8 +100,6 @@ There are the following methods for internal use within this module:
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import UserDict
 import UserList
 

diff --git a/src/engine/SCons/Job.py b/src/engine/SCons/Job.py
index 545df98ce15dfb43601ddf1d47ef15f6623c223b..fec50aac14bf2f8e0398cc8f33927e9e2a6a8de3 100644 (file)
--- a/src/engine/SCons/Job.py
+++ b/src/engine/SCons/Job.py
@@ -31,8 +31,6 @@ stop, and wait on jobs.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import os
 import signal
 

diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index c765ee925d028e80d40e8d404ad31a936fc74c4a..3a92b33c965bbd4d61d1666b0f64af287b96da37 100644 (file)
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -44,8 +44,6 @@ be able to depend on any other type of "thing."
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import copy
 from itertools import chain, izip
 import string

diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 9b3879eb2b267d2e36cb4f87a7f99f9e4abd416c..25fc2bcffa14451f20ffb01a14ff8514f89dac57 100644 (file)
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -28,8 +28,6 @@ Autoconf-like configuration support.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import os
 import re
 import string

diff --git a/src/engine/SCons/SConsign.py b/src/engine/SCons/SConsign.py
index bd4270610aa7e7c8e259de860db6674914ab3ba4..b46d9adb68578a613d37c22f024e8f81eecf8d6b 100644 (file)
--- a/src/engine/SCons/SConsign.py
+++ b/src/engine/SCons/SConsign.py
@@ -29,8 +29,6 @@ Writing and reading information to the .sconsign file or files.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import cPickle
 import os
 import os.path

diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 4a4dd84f97b57b4063559416da0769d8e4754850..dc24b226818396df9f7ce6156343b130f4e504cb 100644 (file)
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -36,8 +36,6 @@ it goes here.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import os
 import os.path
 import string

diff --git a/src/engine/SCons/Script/SConsOptions.py b/src/engine/SCons/Script/SConsOptions.py
index 2148068acd8c370de79385e76159c366b6a43a8b..0e28fd29bf501f3c90403d0737b2ddae1238d1bd 100644 (file)
--- a/src/engine/SCons/Script/SConsOptions.py
+++ b/src/engine/SCons/Script/SConsOptions.py
@@ -23,8 +23,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import optparse
 import re
 import string

diff --git a/src/engine/SCons/Subst.py b/src/engine/SCons/Subst.py
index 52aaae5426b6ca50aeedc39ddd81e57a8a8dfbbd..8646f626ca0d903295570ccd2d0c5c0ff44e9e38 100644 (file)
--- a/src/engine/SCons/Subst.py
+++ b/src/engine/SCons/Subst.py
@@ -29,8 +29,6 @@ SCons string substitution.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import re
 import string
 import types

diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index 27dd1f0f9dd6e560cfb74ff60d3026a8eeeec434..61bab21e6f9274f52571379484a775570035d9b0 100644 (file)
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -50,8 +50,6 @@ interface and the SCons build engine.  There are two key classes here:
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 from itertools import chain
 import operator
 import string

diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index af0978644395aa9d98de6a5b2ac279499ddf2f86..44f615b62bc91e588c14a87824cd9110a988cd74 100644 (file)
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -29,8 +29,6 @@ Various utility functions go here.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import copy
 import os
 import os.path

diff --git a/src/engine/SCons/Variables/BoolVariable.py b/src/engine/SCons/Variables/BoolVariable.py
index 92936e6d4556b0c877d1d6cfe2547fa7a08ff79c..dd162cc1b0a20532df804467ec6372084cab42dc 100644 (file)
--- a/src/engine/SCons/Variables/BoolVariable.py
+++ b/src/engine/SCons/Variables/BoolVariable.py
@@ -40,7 +40,6 @@ __all__ = ['BoolVariable',]
 
 import string
 
-import SCons.compat
 import SCons.Errors
 
 __true_strings  = ('y', 'yes', 'true', 't', '1', 'on' , 'all' )

diff --git a/src/engine/SCons/Variables/BoolVariableTests.py b/src/engine/SCons/Variables/BoolVariableTests.py
index feb4e4eb8e47f44a618b3d69f42c8a254df5962d..ef6815082e6e9ad0d722d2d934fd06653b830c42 100644 (file)
--- a/src/engine/SCons/Variables/BoolVariableTests.py
+++ b/src/engine/SCons/Variables/BoolVariableTests.py
@@ -23,8 +23,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import sys
 import unittest
 

diff --git a/src/engine/SCons/Variables/PackageVariable.py b/src/engine/SCons/Variables/PackageVariable.py
index 6be260d88579f763151015316886ac2c5ecf0a2f..bf74aadb4d84a40140ca2caf725c3884d597a34a 100644 (file)
--- a/src/engine/SCons/Variables/PackageVariable.py
+++ b/src/engine/SCons/Variables/PackageVariable.py
@@ -56,7 +56,6 @@ __all__ = ['PackageVariable',]
 
 import string
 
-import SCons.compat
 import SCons.Errors
 
 __enable_strings  = ('1', 'yes', 'true',  'on', 'enable', 'search')

diff --git a/src/engine/SCons/Variables/PackageVariableTests.py b/src/engine/SCons/Variables/PackageVariableTests.py
index 54116cf9c26bf0772cd4b12119783645447c18cc..4adde2eac80410063c3d4760db00e5f365f003ad 100644 (file)
--- a/src/engine/SCons/Variables/PackageVariableTests.py
+++ b/src/engine/SCons/Variables/PackageVariableTests.py
@@ -23,8 +23,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import sys
 import unittest
 

diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py
index a86cd34b65e88f52b5575e52d17bbf8a40af6460..5a4a5573e60284d31e0ed1b5f7a0c024c2fe813b 100644 (file)
--- a/src/engine/SCons/Variables/__init__.py
+++ b/src/engine/SCons/Variables/__init__.py
@@ -29,8 +29,6 @@ customizable variables to an SCons build.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import SCons.compat
-
 import os.path
 import string
 import sys

diff --git a/src/engine/SCons/__init__.py b/src/engine/SCons/__init__.py
index b5488419fd23a5f526ed080f82dcb7cc535ab0d7..86af342f357ede853fe4fd7543dad6f9ba9cf58a 100644 (file)
--- a/src/engine/SCons/__init__.py
+++ b/src/engine/SCons/__init__.py
@@ -38,3 +38,6 @@ __buildsys__ = "__BUILDSYS__"
 __date__ = "__DATE__"
 
 __developer__ = "__DEVELOPER__"
+
+# make sure compatibility is always in place
+import SCons.compat

diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py
index 20fb8ede5ac1cc9669fb8294cc19ce8491f0debf..59fdc3e3c84952c4b978616182d72db013b4832b 100644 (file)
--- a/src/engine/SCons/compat/__init__.py
+++ b/src/engine/SCons/compat/__init__.py
@@ -29,11 +29,7 @@ implementations of various things that we'd like to use in SCons but which
 only show up in later versions of Python than the early, old version(s)
 we still support.
 
-This package will be imported by other code:
-
-    import SCons.compat
-
-But other code will not generally reference things in this package through
+Other code will not generally reference things in this package through
 the SCons.compat namespace.  The modules included here add things to
 the __builtin__ namespace or the global module list so that the rest
 of our code can use the objects and names imported here regardless of

diff --git a/src/engine/SCons/cpp.py b/src/engine/SCons/cpp.py
index cdd6a3a9350ac4c96dbff177c82d58b0642834df..6ca5f9a9e424212fbf1db447085b247ef798bdc5 100644 (file)
--- a/src/engine/SCons/cpp.py
+++ b/src/engine/SCons/cpp.py
@@ -27,8 +27,6 @@ __doc__ = """
 SCons C Pre-Processor module
 """
 
-import SCons.compat
-
 import os
 import re
 import string