[py-svn] commit/py: hpk42: avoid use_setuptools if setuptools is already importable

[Bitbucket]

1 new changeset in py:

http://bitbucket.org/hpk42/py/changeset/c1f6a1039fe5/
changeset:   c1f6a1039fe5
user:        hpk42
date:        2011-07-09 10:07:52
summary:     avoid use_setuptools if setuptools is already importable
affected #:  2 files (1 byte)

--- a/distribute_setup.py	Fri Jul 08 15:30:03 2011 +0200
+++ b/distribute_setup.py	Sat Jul 09 10:07:52 2011 +0200
@@ -46,7 +46,7 @@
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.13"
+DEFAULT_VERSION = "0.6.19"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 


--- a/setup.py	Fri Jul 08 15:30:03 2011 +0200
+++ b/setup.py	Sat Jul 09 10:07:52 2011 +0200
@@ -1,8 +1,10 @@
 import os, sys
-if sys.version_info >= (3,0):
+
+try:
+    from setuptools import setup
+except ImportError:
     from distribute_setup import use_setuptools
     use_setuptools()
-from setuptools import setup
 
 def main():
     setup(
@@ -37,4 +39,4 @@
     )
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

Repository URL: https://bitbucket.org/hpk42/py/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.