The default ``--index-url`` is now ``http://pypi.python.org/simple``, to

use the Python Package Index's new simpler (and faster!) REST API.
(backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4057965

3 files changed, 3 insertions, 3 deletions

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c21307e3..c1d2fe4f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -156,7 +156,7 @@ class easy_install(Command):
                 else:
                     self.all_site_dirs.append(normalize_path(d))
         if not self.editable: self.check_site_dir()
-        self.index_url = self.index_url or "http://cheeseshop.python.org/pypi"
+        self.index_url = self.index_url or "http://pypi.python.org/simple"
         self.shadow_path = self.all_site_dirs[:]
         for path_item in self.install_dir, normalize_path(self.script_dir):
             if path_item not in self.shadow_path:
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 685ce43b..e91b8540 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -20,7 +20,7 @@ class upload(Command):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index d558b648..fed36a88 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -149,7 +149,7 @@ user_agent = "Python-urllib/%s setuptools/%s" % (
 class PackageIndex(Environment):
     """A distribution index that scans web pages for download URLs"""
 
-    def __init__(self, index_url="http://www.python.org/pypi", hosts=('*',),
+    def __init__(self, index_url="http://pypi.python.org/simple", hosts=('*',),
         *args, **kw
     ):
         Environment.__init__(self,*args,**kw)