Merge pull request datastax#958 from mshuler/pypi-urls

Update PyPI URLs for new Python Package Index

Author: mambocab

cassandra/cluster.py

@@ -559,7 +559,7 @@ def default_retry_policy(self, policy):
     as outlined in RFC 2818 and RFC 6125. Note that this requires the certificate to be transferred, so
     should almost always require the option ``'cert_reqs': ssl.CERT_REQUIRED``. Note also that this functionality was not built into
     Python standard library until (2.7.9, 3.2). To enable this mechanism in earlier versions, patch ``ssl.match_hostname``
-    with a custom or `back-ported function <https://pypi.python.org/pypi/backports.ssl_match_hostname>`_.
+    with a custom or `back-ported function <https://pypi.org/project/backports.ssl_match_hostname/>`_.
     """
 
     sockopts = None

cassandra/metrics.py

@@ -20,7 +20,7 @@
 except ImportError:
     raise ImportError(
         "The scales library is required for metrics support: "
-        "https://pypi.python.org/pypi/scales")
+        "https://pypi.org/project/scales/")
 
 log = logging.getLogger(__name__)
 

docs/installation.rst

@@ -10,7 +10,7 @@ Linux, OSX, and Windows are supported.
 
 Installation through pip
 ------------------------
-`pip <https://pypi.python.org/pypi/pip>`_ is the suggested tool for installing
+`pip <https://pypi.org/project/pip/>`_ is the suggested tool for installing
 packages.  It will handle installing all Python dependencies for the driver at
 the same time as the driver itself.  To install the driver*::