Update some URLs.

9 files changed, 21 insertions, 21 deletions

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
index db556480..f96d8115 100644
--- a/DEVGUIDE.txt
+++ b/DEVGUIDE.txt
@@ -6,7 +6,7 @@ Setuptools is developed using the DVCS Mercurial.
 
 Grab the code at bitbucket::
 
-    $ hg clone https://bitbucket.org/jaraco/setuptools
+    $ hg clone https://bitbucket.org/pypa/setuptools
 
 If you want to contribute changes, we recommend you fork the repository on
 bitbucket, commit the changes to your repository, and then make a pull request
diff --git a/README.txt b/README.txt
index b4a23830..23627e66 100755
--- a/README.txt
+++ b/README.txt
@@ -82,7 +82,7 @@ Downloads
 All setuptools downloads can be found at `the project's home page in the Python
 Package Index`_.  Scroll to the very bottom of the page to find the links.
 
-.. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools#files
+.. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools
 
 In addition to the PyPI downloads, the development version of ``setuptools``
 is available from the `Bitbucket repo`_, and in-development versions of the
diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index 9d49ae5d..a27c85fe 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -1,8 +1,8 @@
 <h3>Download</h3>
 
 <p>Current version: <b>{{ version }}</b></p>
-<p>Get Setuptools from the <a href="http://pypi.python.org/pypi/setuptools"> Python Package Index</a>
+<p>Get Setuptools from the <a href="https://pypi.python.org/pypi/setuptools"> Python Package Index</a>
 
 <h3>Questions? Suggestions? Contributions?</h3>
 
-<p>Visit the <a href="http://bitbucket.org/jaraco/setuptools">Setuptools project page</a> </p>
+<p>Visit the <a href="https://bitbucket.org/pypa/setuptools">Setuptools project page</a> </p>
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index dac0fa8f..12bc73ea 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -31,7 +31,7 @@ Using "Easy Install"
 Installing "Easy Install"
 -------------------------
 
-Please see the `setuptools PyPI page <http://pypi.python.org/pypi/setuptools>`_
+Please see the `setuptools PyPI page <https://pypi.python.org/pypi/setuptools>`_
 for download links and basic installation instructions for each of the
 supported platforms.
 
@@ -806,7 +806,7 @@ Command-Line Options
 
 ``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
     Specifies the base URL of the Python Package Index.  The default is
-    http://pypi.python.org/simple if not specified.  When a package is requested
+    https://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
@@ -995,7 +995,7 @@ that the User installation scheme alone does not provide, e.g. the ability to hi
 
 Please refer to the `virtualenv`_ documentation for more details.
 
-.. _virtualenv: http://pypi.python.org/pypi/virtualenv
+.. _virtualenv: https://pypi.python.org/pypi/virtualenv
 
 
 
@@ -1128,7 +1128,7 @@ History
 0.6c7
  * ``ftp:`` download URLs now work correctly.
 
- * The default ``--index-url`` is now ``http://pypi.python.org/simple``, to use
+ * The default ``--index-url`` is now ``https://pypi.python.org/simple``, to use
    the Python Package Index's new simpler (and faster!) REST API.
 
 0.6c6
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2504dcda..543141f7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -15,7 +15,7 @@ including just a single `bootstrap module`_ (an 8K .py file), your package will
 automatically download and install ``setuptools`` if the user is building your
 package from source and doesn't have a suitable version already installed.
 
-.. _bootstrap module: http://bitbucket.org/jaraco/setuptools/downloads/ez_setup.py
+.. _bootstrap module: https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py
 
 Feature Highlights:
 
@@ -2406,7 +2406,7 @@ The ``upload`` command has a few options worth noting:
 
 ``--repository=URL, -r URL``
     The URL of the repository to upload to.  Defaults to
-    http://pypi.python.org/pypi (i.e., the main PyPI installation).
+    https://pypi.python.org/pypi (i.e., the main PyPI installation).
 
 .. _upload_docs:
 
@@ -2468,7 +2468,7 @@ The ``upload_docs`` command has the following options:
 
 ``--repository=URL, -r URL``
     The URL of the repository to upload to.  Defaults to
-    http://pypi.python.org/pypi (i.e., the main PyPI installation).
+    https://pypi.python.org/pypi (i.e., the main PyPI installation).
 
 
 --------------------------------
diff --git a/release.py b/release.py
index 0136c4b7..632bf4cb 100644
--- a/release.py
+++ b/release.py
@@ -234,7 +234,7 @@ def _linkified_text(rst_content):
 
 	anchors = sorted(anchors)
 
-	bitroot = 'http://bitbucket.org/tarek/distribute'
+	bitroot = 'https://bitbucket.org/tarek/distribute'
 	rst_content += "\n"
 	for x in anchors:
 		issue = re.findall(r'\d+', x)[0]
diff --git a/setup.py b/setup.py
index 1433bb2f..4ea6ad00 100755
--- a/setup.py
+++ b/setup.py
@@ -128,7 +128,7 @@ dist = setup(
     license="PSF or ZPL",
     long_description = long_description,
     keywords = "CPAN PyPI distutils eggs package management",
-    url = "http://pypi.python.org/pypi/setuptools",
+    url = "https://pypi.python.org/pypi/setuptools",
     test_suite = 'setuptools.tests',
     src_root = src_root,
     packages = find_packages(),
@@ -210,12 +210,12 @@ dist = setup(
         "certs": "certifi==0.0.8",
     },
     dependency_links = [
-        'http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
-        'http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
-        'http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
-        'http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
-        'http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
-        'http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
+        'https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
+        'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
+        'https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
+        'https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
+        'https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',
     ],
     scripts = [],
     # tests_require = "setuptools[ssl]",
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 21b9615c..4b500f68 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -23,7 +23,7 @@ class upload(Command):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
+    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index ad856e81..1060e787 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -97,7 +97,7 @@ class TestPackageIndex(unittest.TestCase):
         """
         Download links from the pypi simple index should be used before
         external download links.
-        http://bitbucket.org/tarek/distribute/issue/163/md5-validation-error
+        https://bitbucket.org/tarek/distribute/issue/163
 
         Usecase :
         - someone uploads a package on pypi, a md5 is generated