[Checkins] SVN: Products.GenericSetup/trunk/setup.py Require setuptools, as distutils is too broken to be worth the trouble without it.

Tres Seaver tseaver at palladion.com
Mon Sep 24 19:00:37 EDT 2007


Log message for revision 79954:
  Require setuptools, as distutils is too broken to be worth the trouble without it.

Changed:
  U   Products.GenericSetup/trunk/setup.py

-=-
Modified: Products.GenericSetup/trunk/setup.py
===================================================================
--- Products.GenericSetup/trunk/setup.py	2007-09-24 23:00:31 UTC (rev 79953)
+++ Products.GenericSetup/trunk/setup.py	2007-09-24 23:00:37 UTC (rev 79954)
@@ -1,21 +1,14 @@
 import os
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from setuptools import setup
+from setuptools import find_packages
 
-try:
-    from setuptools import find_packages
-except ImportError:
-    def find_packages():
-        raise NotImplementedError('Must have setuptools to make sdist!')
-
 here = os.path.abspath(os.path.dirname(__file__))
 package = os.path.join(here, 'Products', 'GenericSetup')
 
 def _package_doc(name):
     f = open(os.path.join(package, name))
     return f.read()
+
 NAME = 'GenericSetup'
 
 VERSION = _package_doc('version.txt').strip()



More information about the Checkins mailing list