From 9b90498b07398a229c1b227eac9a0cbde8bd50fc Mon Sep 17 00:00:00 2001
From: Tovin Seven <vinhnt@vn.fujitsu.com>
Date: Fri, 20 Apr 2018 17:30:47 +0700
Subject: [PATCH] Trivial: Update pypi url to new url

Pypi url changed from [1] to [2]

[1] https://pypi.python.org/pypi/<package>
[2] https://pypi.org/project/<package>

Change-Id: Ic639298e83189410395f31cc9ef60076af479efd
---
 CHANGELOG                             | 2 +-
 doc/source/associated_projects.rst    | 2 +-
 doc/source/development_guidelines.rst | 2 +-
 doc/source/getting_started.rst        | 2 +-
 doc/source/overview_encryption.rst    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 124fed76cd..625f6773ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1709,7 +1709,7 @@ swift (1.11.0)
       from the codebase and is now in its own repository at
       https://github.com/openstack/swift-bench. New swift-bench
       binaries and packages may be found on PyPI at
-      https://pypi.python.org/pypi/swift-bench
+      https://pypi.org/project/swift-bench
 
     * Bulk delete now also supports the POST verb, in addition to DELETE
 
diff --git a/doc/source/associated_projects.rst b/doc/source/associated_projects.rst
index 27f761f59d..65790022c1 100644
--- a/doc/source/associated_projects.rst
+++ b/doc/source/associated_projects.rst
@@ -10,7 +10,7 @@ Application Bindings
 
 * OpenStack supported binding:
 
-  * `Python-SwiftClient <https://pypi.python.org/pypi/python-swiftclient>`_
+  * `Python-SwiftClient <https://pypi.org/project/python-swiftclient>`_
 
 * Unofficial libraries and bindings:
 
diff --git a/doc/source/development_guidelines.rst b/doc/source/development_guidelines.rst
index 78228afb3d..8e39a417e8 100644
--- a/doc/source/development_guidelines.rst
+++ b/doc/source/development_guidelines.rst
@@ -199,7 +199,7 @@ automated and not get `caught` by Jenkins.
 
 For example for Vim the `syntastic`_ plugin can do this for you.
 
-.. _`hacking`: https://pypi.python.org/pypi/hacking
+.. _`hacking`: https://pypi.org/project/hacking
 .. _`syntastic`: https://github.com/scrooloose/syntastic
 
 ------------------------
diff --git a/doc/source/getting_started.rst b/doc/source/getting_started.rst
index bf96d800e9..f23bc321b8 100644
--- a/doc/source/getting_started.rst
+++ b/doc/source/getting_started.rst
@@ -39,7 +39,7 @@ There are many clients in the :ref:`ecosystem <application-bindings>`. The offic
 and SDK is python-swiftclient.
 
 * `Source code <https://github.com/openstack/python-swiftclient>`_
-* `Python Package Index <https://pypi.python.org/pypi/python-swiftclient>`_
+* `Python Package Index <https://pypi.org/project/python-swiftclient>`_
 
 ----------
 Production
diff --git a/doc/source/overview_encryption.rst b/doc/source/overview_encryption.rst
index 90ab897fd3..94aadd7058 100644
--- a/doc/source/overview_encryption.rst
+++ b/doc/source/overview_encryption.rst
@@ -334,7 +334,7 @@ Encryption scheme
 
 Plaintext data is encrypted to ciphertext using the AES cipher with 256-bit
 keys implemented by the python `cryptography package
-<https://pypi.python.org/pypi/cryptography>`_. The cipher is used in counter
+<https://pypi.org/project/cryptography>`_. The cipher is used in counter
 (CTR) mode so that any byte or range of bytes in the ciphertext may be
 decrypted independently of any other bytes in the ciphertext. This enables very
 simple handling of ranged GETs.