Update all pypi.python.org URLs to pypi.org (#38988)

For details on the new PyPI, see the blog post:

https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html

contrib/inventory/scaleway.py

@@ -9,7 +9,7 @@ Shamelessly copied from an existing inventory script.
 
 This script generates an inventory that Ansible can understand by making API requests to Scaleway API
 
-Requires some python libraries, ensure to have them installed when using this script. (pip install requests https://pypi.python.org/pypi/requests)
+Requires some python libraries, ensure to have them installed when using this script. (pip install requests https://pypi.org/project/requests/)
 
 Before using this script you may want to modify scaleway.ini config file.
 

contrib/inventory/serf.py

@@ -21,7 +21,7 @@
 # (https://serfdom.io/).
 #
 # Requires the `serfclient` Python module from
-# https://pypi.python.org/pypi/serfclient
+# https://pypi.org/project/serfclient/
 #
 # Environment variables
 # ---------------------
@@ -35,7 +35,7 @@ import collections
 import os
 import sys
 
-# https://pypi.python.org/pypi/serfclient
+# https://pypi.org/project/serfclient/
 from serfclient import SerfClient, EnvironmentConfig
 
 try:

contrib/vault/vault-keyring-client.py

@@ -25,7 +25,7 @@
 # This file *MUST* be saved with executable permissions. Otherwise, Ansible
 # will try to parse as a password file and display: "ERROR! Decryption failed"
 #
-# The `keyring` Python module is required: https://pypi.python.org/pypi/keyring
+# The `keyring` Python module is required: https://pypi.org/project/keyring/
 #
 # By default, this script will store the specified password in the keyring of
 # the user that invokes the script. To specify a user keyring, add a [vault]

contrib/vault/vault-keyring.py

@@ -26,7 +26,7 @@
 # This file *MUST* be saved with executable permissions. Otherwise, Ansible
 # will try to parse as a password file and display: "ERROR! Decryption failed"
 #
-# The `keyring` Python module is required: https://pypi.python.org/pypi/keyring
+# The `keyring` Python module is required: https://pypi.org/project/keyring/
 #
 # By default, this script will store the specified password in the keyring of
 # the user that invokes the script. To specify a user keyring, add a [vault]