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

(cherry picked from commit 9d6d06e806)

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

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',

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;;}
@@ -42,7 +42,7 @@ This variant of Python 3.6 now includes its own private copy of OpenSSL 1.0.2.
 \f1 /Applications/Python 3.6
 \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.\
 \

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

Misc/python.man

@@ -445,7 +445,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

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"]