[Supervisor-checkins] r910 - supervisor/trunk

[Mike Naberezny]

Author: Mike Naberezny <mike at maintainable.com>
Date: Sun Nov  1 14:27:10 2009
New Revision: 910

Log:
We no longer bundle ez_setup to bootstrap setuptools installation.

Removed:
   supervisor/trunk/ez_setup.py
Modified:
   supervisor/trunk/CHANGES.txt
   supervisor/trunk/setup.py

Modified: supervisor/trunk/CHANGES.txt
==============================================================================
--- supervisor/trunk/CHANGES.txt	(original)
+++ supervisor/trunk/CHANGES.txt	Sun Nov  1 14:27:10 2009
@@ -666,7 +666,7 @@
     typically) were evident at supervisord "reload" time (when using
     the "reload" command from supervisorctl).
 
-  - Updated ez_setup.py to one that knows about setuptools 0.6c7.
+  - We no longer bundle ez_setup to bootstrap setuptools installation.
 
 3.0a2 (2007-08-24)
 

Modified: supervisor/trunk/setup.py
==============================================================================
--- supervisor/trunk/setup.py	(original)
+++ supervisor/trunk/setup.py	Sun Nov  1 14:27:10 2009
@@ -21,9 +21,6 @@
     # in there in Python 2.3.3, so we just alias it.
     urllib2.splituser = urllib.splituser
 
-from ez_setup import use_setuptools
-use_setuptools()
-
 import os
 import sys
 
@@ -37,7 +34,7 @@
 requires = ['meld3 >= 0.6.5']
 
 if sys.version_info[:2] < (2, 5):
-    # for meld3 (its a distutils package)
+    # for meld3 (it's a distutils package)
     requires.append('elementtree')
 
 from setuptools import setup, find_packages