[Python-checkins] more pypi.python.org -> pypi.org for 3.6 (GH-7616)

[Ned Deily]

https://github.com/python/cpython/commit/4836dc997386399e1850637983cb540169690e40
commit: 4836dc997386399e1850637983cb540169690e40
branch: 3.6
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2018-06-11T01:29:28-04:00
summary:

more pypi.python.org -> pypi.org for 3.6 (GH-7616)

files:
M Doc/distutils/setupscript.rst
M Doc/howto/pyporting.rst

diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 38e0202e4ac1..21d569b65c3f 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -609,7 +609,7 @@ Notes:
 (4)
     These fields should not be used if your package is to be compatible with Python
     versions prior to 2.2.3 or 2.3.  The list is available from the `PyPI website
-    <https://pypi.python.org/pypi>`_.
+    <https://pypi.org/>`_.
 
 (5)
     The ``long_description`` field is used by PyPI when you are
diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
index 2a27041ab482..88b01779d2a5 100644
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -432,7 +432,7 @@ to make sure everything functions as expected in both versions of Python.
 .. _coverage.py: https://pypi.org/project/coverage
 .. _Futurize: http://python-future.org/automatic_conversion.html
 .. _importlib: https://docs.python.org/3/library/importlib.html#module-importlib
-.. _importlib2: https://pypi.python.org/pypi/importlib2
+.. _importlib2: https://pypi.org/project/importlib2
 .. _Modernize: https://python-modernize.readthedocs.org/en/latest/
 .. _mypy: http://mypy-lang.org/
 .. _Porting to Python 3: http://python3porting.com/