Removed old_where, as planned in the deprecation timeline (#97)
diff --git a/README.rst b/README.rst index 9339ee0..1e53cec 100644 --- a/README.rst +++ b/README.rst
@@ -37,10 +37,7 @@ In previous versions, ``certifi`` provided the ``certifi.old_where()`` function to intentionally re-add the 1024-bit roots back into your bundle. This was not -recommended in production and therefore was removed. To assist in migrating old -code, the function ``certifi.old_where()`` continues to exist as an alias of -``certifi.where()``. Please update your code to use ``certifi.where()`` -instead. ``certifi.old_where()`` will be removed in 2018. +recommended in production and therefore was removed at the end of 2018. .. _`Certifi`: https://certifi.io/en/latest/ .. _`Requests`: http://docs.python-requests.org/en/latest/
diff --git a/certifi/__init__.py b/certifi/__init__.py index 50f2e13..3964c81 100644 --- a/certifi/__init__.py +++ b/certifi/__init__.py
@@ -1,3 +1,3 @@ -from .core import where, old_where +from .core import where __version__ = "2018.10.15"
diff --git a/certifi/core.py b/certifi/core.py index eab9d1d..2d02ea4 100644 --- a/certifi/core.py +++ b/certifi/core.py
@@ -8,14 +8,6 @@ This module returns the installation location of cacert.pem. """ import os -import warnings - - -class DeprecatedBundleWarning(DeprecationWarning): - """ - The weak security bundle is being deprecated. Please bother your service - provider to get them to stop using cross-signed roots. - """ def where(): @@ -24,14 +16,5 @@ return os.path.join(f, 'cacert.pem') -def old_where(): - warnings.warn( - "The weak security bundle has been removed. certifi.old_where() is now an alias " - "of certifi.where(). Please update your code to use certifi.where() instead. " - "certifi.old_where() will be removed in 2018.", - DeprecatedBundleWarning - ) - return where() - if __name__ == '__main__': print(where())