From 07f1a31c3eb453aab91646834087f3258254990f Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 18 Oct 2009 14:46:54 +0200
Subject: no_fake needs to be True by default fixes #74

--HG--
branch : distribute
extra : rebase_source : 158f5abb9528d7ea6cd436996d5022cb6bcda89e
---
 CHANGES.txt                    |  1 +
 distribute_setup.py            | 11 ++++++-----
 tests/test_distribute_setup.py | 12 ++++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e6816cfe..44c62fa3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.7
 -----
 
+* Issue 74: no_fake should be True by default.
 
 -----
 0.6.6
diff --git a/distribute_setup.py b/distribute_setup.py
index d9912010..e7aafbb1 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -124,7 +124,7 @@ def _do_download(version, download_base, to_dir, download_delay):
 
 
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                   to_dir=os.curdir, download_delay=15, no_fake=False):
+                   to_dir=os.curdir, download_delay=15, no_fake=True):
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
     was_imported = 'pkg_resources' in sys.modules or \
@@ -134,7 +134,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
             import pkg_resources
             if not hasattr(pkg_resources, '_distribute'):
                 if not no_fake:
-                    fake_setuptools()
+                    _fake_setuptools()
                 raise ImportError
         except ImportError:
             return _do_download(version, download_base, to_dir, download_delay)
@@ -159,7 +159,8 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
             return _do_download(version, download_base, to_dir,
                                 download_delay)
     finally:
-        _create_fake_setuptools_pkg_info(to_dir)
+        if not no_fake:
+            _create_fake_setuptools_pkg_info(to_dir)
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                         to_dir=os.curdir, delay=15):
@@ -319,7 +320,7 @@ def _patch_egg_dir(path):
 
 def _before_install():
     log.warn('Before install bootstrap.')
-    fake_setuptools()
+    _fake_setuptools()
 
 
 def _under_prefix(location):
@@ -340,7 +341,7 @@ def _under_prefix(location):
     return True
 
 
-def fake_setuptools():
+def _fake_setuptools():
     log.warn('Scanning installed packages')
     try:
         import pkg_resources
diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py
index 4c9079a7..4151587f 100644
--- a/tests/test_distribute_setup.py
+++ b/tests/test_distribute_setup.py
@@ -57,5 +57,17 @@ class TestSetup(unittest.TestCase):
         distribute_setup.python_cmd = _faked
         _install(self.tarball)
 
+    def test_use_setuptools(self):
+        self.assertEquals(use_setuptools(), None)
+
+        # make sure fake_setuptools is not called by default
+        import pkg_resources
+        del pkg_resources._distribute
+        def fake_setuptools(*args):
+            raise AssertionError
+
+        pkg_resources._fake_setuptools = fake_setuptools
+        use_setuptools()
+
 if __name__ == '__main__':
     unittest.main()
-- 
cgit v1.2.3