Skip to content

Commit

Permalink
Drop deprecated basic_auth and digest_auth
Browse files Browse the repository at this point in the history
Also remove ``httpauth`` module

Resolves #1688
  • Loading branch information
webknjaz committed May 21, 2018
1 parent 98f2cfb commit 38ad1da
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 520 deletions.
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
v15+dev
-------

* :issue:`1688`: Removed ``basic_auth`` and ``digest_auth`` tools and
the ``httpauth`` module, which have been officially deprecated earlier
in v14.0.0.

v15.0.0
-------

Expand Down
6 changes: 2 additions & 4 deletions cherrypy/_cptools.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import cherrypy
from cherrypy._helper import expose

from cherrypy.lib import cptools, encoding, auth, static, jsontools
from cherrypy.lib import cptools, encoding, static, jsontools
from cherrypy.lib import sessions as _sessions, xmlrpcutil as _xmlrpc
from cherrypy.lib import caching as _caching
from cherrypy.lib import auth_basic, auth_digest
Expand Down Expand Up @@ -494,8 +494,6 @@ def decorator(func):
_d.expires = Tool('before_finalize', _caching.expires)
_d.ignore_headers = Tool('before_request_body', cptools.ignore_headers)
_d.referer = Tool('before_request_body', cptools.referer)
_d.basic_auth = Tool('on_start_resource', auth.basic_auth)
_d.digest_auth = Tool('on_start_resource', auth.digest_auth)
_d.trailing_slash = Tool('before_handler', cptools.trailing_slash, priority=60)
_d.flatten = Tool('before_finalize', cptools.flatten)
_d.accept = Tool('on_start_resource', cptools.accept)
Expand All @@ -507,4 +505,4 @@ def decorator(func):
_d.auth_digest = Tool('before_handler', auth_digest.digest_auth, priority=1)
_d.params = Tool('before_handler', cptools.convert_params, priority=15)

del _d, cptools, encoding, auth, static
del _d, cptools, encoding, static
127 changes: 0 additions & 127 deletions cherrypy/lib/auth.py

This file was deleted.

0 comments on commit 38ad1da

Please sign in to comment.