[Python-checkins] pypi.python.org -> pypi.org (GH-7613) (GH-7614)

[Ned Deily]

https://github.com/python/cpython/commit/a9846e0c701d7b9c13ccccc6e1233cf02ca27b95
commit: a9846e0c701d7b9c13ccccc6e1233cf02ca27b95
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Ned Deily <nad at python.org>
date: 2018-06-11T01:05:22-04:00
summary:

pypi.python.org -> pypi.org (GH-7613) (GH-7614)

(cherry picked from commit 9d6d06e8065d45f375f4a80e2d7e13b032da1f5b)

Co-authored-by: Ned Deily <nad at python.org>

files:
M Lib/unittest/mock.py
M Mac/BuildScript/resources/ReadMe.rtf
M Mac/BuildScript/resources/install_certificates.command
M Misc/python.man
M Tools/scripts/checkpip.py

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 9302dedae7fd..382696d6c7e9 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -2,7 +2,7 @@
 # Test tools for mocking and patching.
 # Maintained by Michael Foord
 # Backport for other versions of Python available from
-# http://pypi.python.org/pypi/mock
+# https://pypi.org/project/mock
 
 __all__ = (
     'Mock',
diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf
index 81d4a99475cf..0ef36ca42bae 100644
--- a/Mac/BuildScript/resources/ReadMe.rtf
+++ b/Mac/BuildScript/resources/ReadMe.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf200
+{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf400
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
@@ -44,7 +44,7 @@ This variant of Python 3.7 includes its own private copy of OpenSSL 1.1.0.  The
 \f1 /Applications/Python 3.7
 \f0  to install a curated bundle of default root certificates from the third-party 
 \f1 certifi
-\f0  package ({\field{\*\fldinst{HYPERLINK "https://pypi.python.org/pypi/certifi"}}{\fldrslt https://pypi.python.org/pypi/certifi}}).  If you choose to use 
+\f0  package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}).  If you choose to use 
 \f1 certifi
 \f0 , you should consider subscribing to the{\field{\*\fldinst{HYPERLINK "https://certifi.io/en/latest/"}}{\fldrslt  project's email update service}} to be notified when the certificate bundle is updated.\
 \
diff --git a/Mac/BuildScript/resources/install_certificates.command b/Mac/BuildScript/resources/install_certificates.command
index 1d2e2d878cd8..19b4adac07bb 100755
--- a/Mac/BuildScript/resources/install_certificates.command
+++ b/Mac/BuildScript/resources/install_certificates.command
@@ -6,7 +6,7 @@
 #
 # sample script to install or update a set of default Root Certificates
 # for the ssl module.  Uses the certificates provided by the certifi package:
-#       https://pypi.python.org/pypi/certifi
+#       https://pypi.org/project/certifi/
 
 import os
 import os.path
diff --git a/Misc/python.man b/Misc/python.man
index a0084f84d04e..471953e7f16b 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -448,7 +448,7 @@ Developer resources:  https://devguide.python.org/
 .br
 Downloads:  https://www.python.org/downloads/
 .br
-Module repository:  https://pypi.python.org/
+Module repository:  https://pypi.org/
 .br
 Newsgroups:  comp.lang.python, comp.lang.python.announce
 .SH LICENSING
diff --git a/Tools/scripts/checkpip.py b/Tools/scripts/checkpip.py
index 8a64eda34af6..a4a9ddfa6f32 100755
--- a/Tools/scripts/checkpip.py
+++ b/Tools/scripts/checkpip.py
@@ -14,7 +14,7 @@ def main():
 
     for project, version in ensurepip._PROJECTS:
         data = json.loads(urllib.request.urlopen(
-            "https://pypi.python.org/pypi/{}/json".format(project),
+            "https://pypi.org/pypi/{}/json".format(project),
             cadefault=True,
         ).read().decode("utf8"))
         upstream_version = data["info"]["version"]