[gentoo-commits] gentoo-x86 commit in dev-python/setuptools/files: distribute-0.6.1-provide_setuptools.patch distribute-0.6.1-USER_SITE.patch

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/09/10 01:20:14

  Added:                distribute-0.6.1-provide_setuptools.patch
                        distribute-0.6.1-USER_SITE.patch
  Log:
  Version bump.
  (Portage version: 14221-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch?rev=1.1&content-type=text/plain

Index: distribute-0.6.1-provide_setuptools.patch
===================================================================
--- setup.py
+++ setup.py
@@ -28,7 +28,7 @@
     before_install()
 
 dist = setup(
-    name="distribute",
+    name="setuptools",
     version=VERSION,
     description="Download, build, install, upgrade, and uninstall Python "
         "packages -- easily!",
--- setuptools/package_index.py
+++ setuptools/package_index.py
@@ -143,7 +143,7 @@
                 yield urlparse.urljoin(url, htmldecode(match.group(1)))
 
 user_agent = "Python-urllib/%s distribute/%s" % (
-    urllib2.__version__, require('distribute')[0].version
+    urllib2.__version__, require('setuptools')[0].version
 )
 
 



1.1                  dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch?rev=1.1&content-type=text/plain

Index: distribute-0.6.1-USER_SITE.patch
===================================================================
http://bitbucket.org/tarek/distribute/changeset/2545492098ff/

--- distribute_setup.py
+++ distribute_setup.py
@@ -13,7 +13,11 @@ the appropriate options to ``use_setupto
 
 This file can also be run as a script to install or upgrade setuptools.
 """
-from site import USER_SITE
+try:
+    from site import USER_SITE
+except ImportError:
+    USER_SITE = None
+
 import sys
 import os
 import time
@@ -199,7 +203,7 @@ def _under_prefix(location):
                 if len(args) > index:
                     top_dir = args[index+1]
                     return location.startswith(top_dir)
-            elif option == '--user':
+            elif option == '--user' and USER_SITE is not None:
                 return location.startswith(USER_SITE)
     return True