[SQL-CVS] r4754 - in SQLObject/trunk: . docs

Author: phd
Date: Thu Jun 26 07:56:30 2014
New Revision: 4754

Log:
Merge revision 4753 from branch 1.7: "upgrade" ez_setup to 5.2

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/ez_setup.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Thu Jun 26 07:55:28 2014	(r4753)
+++ SQLObject/trunk/docs/News.txt	Thu Jun 26 07:56:30 2014	(r4754)
@@ -34,7 +34,7 @@
 Minor features
 --------------
 
-* Upgrade ez_setup to 5.0.
+* Upgrade ez_setup to 5.2.
 
 Bugfixes
 --------

Modified: SQLObject/trunk/ez_setup.py
==============================================================================
--- SQLObject/trunk/ez_setup.py	Thu Jun 26 07:55:28 2014	(r4753)
+++ SQLObject/trunk/ez_setup.py	Thu Jun 26 07:56:30 2014	(r4754)
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.0"
+DEFAULT_VERSION = "5.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):