Skip to content

Commit a462d21

Browse files
alexLukasa
authored andcommitted
Removed old_where, as planned in the deprecation timeline (certifi#97)
1 parent 5b9e05c commit a462d21

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

README.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ its bundle, ``certifi`` removed them as well.
3737

3838
In previous versions, ``certifi`` provided the ``certifi.old_where()`` function
3939
to intentionally re-add the 1024-bit roots back into your bundle. This was not
40-
recommended in production and therefore was removed. To assist in migrating old
41-
code, the function ``certifi.old_where()`` continues to exist as an alias of
42-
``certifi.where()``. Please update your code to use ``certifi.where()``
43-
instead. ``certifi.old_where()`` will be removed in 2018.
40+
recommended in production and therefore was removed at the end of 2018.
4441

4542
.. _`Certifi`: https://certifi.io/en/latest/
4643
.. _`Requests`: http://docs.python-requests.org/en/latest/

certifi/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from .core import where, old_where
1+
from .core import where
22

33
__version__ = "2018.10.15"

certifi/core.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
This module returns the installation location of cacert.pem.
99
"""
1010
import os
11-
import warnings
12-
13-
14-
class DeprecatedBundleWarning(DeprecationWarning):
15-
"""
16-
The weak security bundle is being deprecated. Please bother your service
17-
provider to get them to stop using cross-signed roots.
18-
"""
1911

2012

2113
def where():
@@ -24,14 +16,5 @@ def where():
2416
return os.path.join(f, 'cacert.pem')
2517

2618

27-
def old_where():
28-
warnings.warn(
29-
"The weak security bundle has been removed. certifi.old_where() is now an alias "
30-
"of certifi.where(). Please update your code to use certifi.where() instead. "
31-
"certifi.old_where() will be removed in 2018.",
32-
DeprecatedBundleWarning
33-
)
34-
return where()
35-
3619
if __name__ == '__main__':
3720
print(where())

0 commit comments

Comments
 (0)