diff options
| author | Steven Knight <knight@baldmt.com> | 2010-04-11 18:56:18 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-04-11 18:56:18 (GMT) |
| commit | df6e06482bdbacf0c7f5c6838edc5236db133a22 (patch) | |
| tree | c7ce8eac4ff8213c57911c69a26e50e0f13cdcba /src/engine | |
| parent | 87458be9755919b6d21ec395001f916db81ec5c5 (diff) | |
| download | SCons-df6e06482bdbacf0c7f5c6838edc5236db133a22.zip SCons-df6e06482bdbacf0c7f5c6838edc5236db133a22.tar.gz SCons-df6e06482bdbacf0c7f5c6838edc5236db133a22.tar.bz2 | |
Towards issue 2336: Rename the compat/builtins.py module to
compat/_scons_builtings.py, to avoid the name conflict.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/MANIFEST.in | 2 | ||||
| -rw-r--r-- | src/engine/SCons/compat/__init__.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/compat/_scons_builtins.py (renamed from src/engine/SCons/compat/builtins.py) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 576c82c..6ed0dd7 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -2,6 +2,7 @@ SCons/__init__.py SCons/Action.py SCons/Builder.py SCons/compat/__init__.py +SCons/compat/_scons_builtins.py SCons/compat/_scons_collections.py SCons/compat/_scons_hashlib.py SCons/compat/_scons_io.py @@ -11,7 +12,6 @@ SCons/compat/_scons_sets.py SCons/compat/_scons_shlex.py SCons/compat/_scons_subprocess.py SCons/compat/_scons_textwrap.py -SCons/compat/builtins.py SCons/CacheDir.py SCons/Conftest.py SCons/cpp.py diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py index cc14b92..79c6241 100644 --- a/src/engine/SCons/compat/__init__.py +++ b/src/engine/SCons/compat/__init__.py @@ -73,7 +73,7 @@ def import_as(module, name): file, filename, suffix_mode_type = imp.find_module(module, [dir]) imp.load_module(name, file, filename, suffix_mode_type) -import builtins +import _scons_builtins try: import hashlib diff --git a/src/engine/SCons/compat/builtins.py b/src/engine/SCons/compat/_scons_builtins.py index 4f7e710..4f7e710 100644 --- a/src/engine/SCons/compat/builtins.py +++ b/src/engine/SCons/compat/_scons_builtins.py |