Split wrappers

CHANGES.rst

@@ -232,6 +232,11 @@ Unreleased
         :class:`werkzeug.middleware.http_proxy.ProxyMiddleware`.
     -   ``werkzeug.wsgi.SharedDataMiddleware`` has moved to
         :class:`werkzeug.middleware.shared_data.SharedDataMiddleware`.
+-   The ``werkzeug.wrappers`` module has been converted to a package,
+    and its various classes have been organized into separate modules.
+    The documented classes, understood to be the public API, are still
+    importable from ``werkzeug.wrappers``, or may be imported from their
+    specific modules. (`#1456`_)
 
 .. _#4: https://github.com/pallets/werkzeug/issues/4
 .. _`#209`: https://github.com/pallets/werkzeug/pull/209
@@ -303,6 +308,7 @@ Unreleased
 .. _#1439: https://github.com/pallets/werkzeug/pull/1439
 .. _#1445: https://github.com/pallets/werkzeug/pull/1445
 .. _#1452: https://github.com/pallets/werkzeug/pull/1452
+.. _#1456: https://github.com/pallets/werkzeug/pull/1456
 
 
 Version 0.14.1

setup.cfg

@@ -31,3 +31,5 @@ source =
 ignore = E126,E241,E272,E305,E402,E731,W503
 exclude=.tox,examples,docs
 max-line-length=100
+per-file-ignores =
+    werkzeug/wrappers/__init__.py: F401

tests/test_wrappers.py

@@ -24,11 +24,14 @@
 from werkzeug import wrappers
 from werkzeug.exceptions import SecurityError, RequestedRangeNotSatisfiable, \
     BadRequest
+from werkzeug.http import generate_etag
 from werkzeug.wrappers.json import JSONMixin
 from werkzeug.wsgi import LimitedStream, wrap_file
-from werkzeug.datastructures import MultiDict, ImmutableOrderedMultiDict, \
-    ImmutableList, ImmutableTypeConversionDict, CharsetAccept, \
-    MIMEAccept, LanguageAccept, Accept, CombinedMultiDict
+from werkzeug.datastructures import (
+    MultiDict, ImmutableOrderedMultiDict,
+    ImmutableList, ImmutableTypeConversionDict, CharsetAccept,
+    MIMEAccept, LanguageAccept, Accept, CombinedMultiDict, Headers,
+)
 from werkzeug.test import Client, create_environ, run_wsgi_app
 from werkzeug._compat import implements_iterator, text_type
 
@@ -713,7 +716,7 @@ class WithoutFreeze(wrappers.BaseResponse, wrappers.ETagResponseMixin):
     response = WithFreeze('Hello World')
     response.freeze()
     strict_eq(response.get_etag(),
-              (text_type(wrappers.generate_etag(b'Hello World')), False))
+              (text_type(generate_etag(b'Hello World')), False))
     response = WithoutFreeze('Hello World')
     response.freeze()
     assert response.get_etag() == (None, None)
@@ -1080,7 +1083,7 @@ class MyRequest(wrappers.Request):
 
 
 def test_response_headers_passthrough():
-    headers = wrappers.Headers()
+    headers = Headers()
     resp = wrappers.Response(headers=headers)
     assert resp.headers is headers