Switch default package-index to cheeseshop.python.org, and make

setuptools' home page its cheeseshop page.  (backport from trunk)

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

2 files changed, 2 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 68203829..9e92b69f 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ setup(
     license="PSF or ZPL",
     long_description = open('README.txt').read(),
     keywords = "CPAN PyPI distutils eggs package management",
-    url = "http://peak.telecommunity.com/DevCenter/setuptools",
+    url = "http://cheeseshop.python.org/pypi/setuptools",
     test_suite = 'setuptools.tests',
     packages = find_packages(),
     package_data = {'setuptools':['*.exe']},
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f7a39907..79a441bd 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://www.python.org/pypi"
+        self.index_url = self.index_url or "http://cheeseshop.python.org/pypi"
         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: