From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sun, 11 Apr 2010 18:56:18 +0000 (+0000)
Subject: Towards issue 2336:  Rename the compat/builtins.py module to
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58be66782a91caeec919c293200f90c64adbbf36;p=scons.git

Towards issue 2336:  Rename the compat/builtins.py module to
compat/_scons_builtings.py, to avoid the name conflict.


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

diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index 576c82cd..6ed0dd78 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 cc14b92a..79c62413 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
similarity index 100%
rename from src/engine/SCons/compat/builtins.py
rename to src/engine/SCons/compat/_scons_builtins.py