summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2017-11-20 15:37:17 -0700
committerBert JW Regeer <bertjw@regeer.org>2017-11-20 15:37:17 -0700
commit22ceb9a311409005f5ccd28a1a6fbb79d5cd08a1 (patch)
tree00b809a20f2ae5c4626208b12c2597c5617708ac
parent138344dd37e07348bbbfaae39d4b196acad3b989 (diff)
downloadwebob-22ceb9a311409005f5ccd28a1a6fbb79d5cd08a1.tar.gz
Remove deprecations that were raising
-rw-r--r--src/webob/etag.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/webob/etag.py b/src/webob/etag.py
index 66df56e..e799183 100644
--- a/src/webob/etag.py
+++ b/src/webob/etag.py
@@ -9,11 +9,7 @@ from webob.datetime_utils import (
serialize_date,
)
from webob.descriptors import _rx_etag
-
-from webob.util import (
- header_docstring,
- warn_deprecation,
- )
+from webob.util import header_docstring
__all__ = ['AnyETag', 'NoETag', 'ETagMatcher', 'IfRange', 'etag_property']
@@ -35,11 +31,7 @@ def etag_property(key, default, rfc_section, strong=True):
del req.environ[key]
return property(fget, fset, fdel, doc=doc)
-def _warn_weak_match_deprecated():
- warn_deprecation("weak_match is deprecated", '1.2', 3)
-def _warn_if_range_match_deprecated(*args, **kw): # pragma: no cover
- raise DeprecationWarning("IfRange.match[_response] API is deprecated")
class _AnyETag(object):
@@ -58,9 +50,6 @@ class _AnyETag(object):
def __contains__(self, other):
return True
- def weak_match(self, other):
- _warn_weak_match_deprecated()
-
def __str__(self):
return '*'
@@ -82,9 +71,6 @@ class _NoETag(object):
def __contains__(self, other):
return False
- def weak_match(self, other): # pragma: no cover
- _warn_weak_match_deprecated()
-
def __str__(self):
return ''
@@ -100,9 +86,6 @@ class ETagMatcher(object):
def __contains__(self, other):
return other in self.etags
- def weak_match(self, other): # pragma: no cover
- _warn_weak_match_deprecated()
-
def __repr__(self):
return '<ETag %s>' % (' or '.join(self.etags))
@@ -162,7 +145,6 @@ class IfRange(object):
def __str__(self):
return str(self.etag) if self.etag else ''
- match = match_response = _warn_if_range_match_deprecated
__bool__ = __nonzero__ # python 3
@@ -185,5 +167,3 @@ class IfRangeDate(object):
def __str__(self):
return serialize_date(self.date)
-
- match = match_response = _warn_if_range_match_deprecated