Attachment 633995 Details for Bug 870511 – Update default pypi urls to reflect changes on the server

[patch] Update default pypi urls to reflect changes on the server

setuptools-pypi-url-change.patch (text/plain), 3.17 KB, created by Toshio Ernie Kuratomi on 2012-10-26 17:40:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2012-10-26 17:40:17 UTC

Size: 3.17 KB

patch

obsolete

>diff -uNr setuptools-0.6c5.bak/EasyInstall.txt setuptools-0.6c5/EasyInstall.txt
>--- setuptools-0.6c5.bak/EasyInstall.txt	2007-01-09 11:20:24.000000000 -0800
>+++ setuptools-0.6c5/EasyInstall.txt	2012-10-26 10:17:35.920280809 -0700
>@@ -776,7 +776,7 @@
> 
> ``--index-url=URL, -i URL`` (New in 0.4a1)
>     Specifies the base URL of the Python Package Index.  The default is
>-    http://www.python.org/pypi if not specified.  When a package is requested
>+    http://pypi.python.org/simple if not specified.  When a package is requested
>     that is not locally available or linked from a ``--find-links`` download
>     page, the package index will be searched for download pages for the needed
>     package, and those download pages will be searched for links to download
>diff -uNr setuptools-0.6c5.bak/setuptools/command/easy_install.py setuptools-0.6c5/setuptools/command/easy_install.py
>--- setuptools-0.6c5.bak/setuptools/command/easy_install.py	2007-01-09 11:20:24.000000000 -0800
>+++ setuptools-0.6c5/setuptools/command/easy_install.py	2012-10-26 09:56:31.368599207 -0700
>@@ -156,7 +156,7 @@
>                 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 -uNr setuptools-0.6c5.bak/setuptools/command/upload.py setuptools-0.6c5/setuptools/command/upload.py
>--- setuptools-0.6c5.bak/setuptools/command/upload.py	2006-09-20 14:05:03.000000000 -0700
>+++ setuptools-0.6c5/setuptools/command/upload.py	2012-10-26 09:57:25.029069876 -0700
>@@ -20,7 +20,7 @@
> 
>     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 -uNr setuptools-0.6c5.bak/setuptools/package_index.py setuptools-0.6c5/setuptools/package_index.py
>--- setuptools-0.6c5.bak/setuptools/package_index.py	2007-01-09 09:38:27.000000000 -0800
>+++ setuptools-0.6c5/setuptools/package_index.py	2012-10-26 09:58:48.696244546 -0700
>@@ -149,7 +149,7 @@
> 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)
>diff -uNr setuptools-0.6c5.bak/setuptools.txt setuptools-0.6c5/setuptools.txt
>--- setuptools-0.6c5.bak/setuptools.txt	2007-01-09 11:20:24.000000000 -0800
>+++ setuptools-0.6c5/setuptools.txt	2012-10-26 10:19:56.771987513 -0700
>@@ -2343,7 +2343,7 @@
> 
> ``--repository=URL, -r URL``
>     The URL of the repository to upload to.  Defaults to
>-    http://www.python.org/pypi (i.e., the main PyPI installation).
>+    http://pypi.python.org/pypi (i.e., the main PyPI installation).
> 
> 
> ------------------------------------

Actions: View | Diff

Attachments on bug 870511: 633995