From: Andreas Røsdal <andreas.rosdal@gmail.com>
Date: Wed, 8 Mar 2017 19:57:39 +0000 (+0100)
Subject: Fix for Python 2.7.
X-Git-Tag: v4.5.0~23^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ee36275d470862c59913c875409ac0d7482d9b0;p=thirdparty%2Ftornado.git

Fix for Python 2.7.
---

diff --git a/tornado/websocket.py b/tornado/websocket.py
index 48486d5bd..78549c619 100644
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -689,7 +689,7 @@ class WebSocketProtocol13(WebSocketProtocol):
             else:
                 raise ValueError("unsupported extension %r", ext)
 
-    def _get_compressor_options(self, side, agreed_parameters):
+    def _get_compressor_options(self, side, agreed_parameters, compression_options):
         """Converts a websocket agreed_parameters set to keyword arguments
         for our compressor objects.
         """
@@ -700,6 +700,7 @@ class WebSocketProtocol13(WebSocketProtocol):
             options['max_wbits'] = zlib.MAX_WBITS
         else:
             options['max_wbits'] = int(wbits_header)
+        options['compression_options'] = compression_options
         return options
 
     def _create_compressors(self, side, agreed_parameters, compression_options=None):
@@ -713,7 +714,7 @@ class WebSocketProtocol13(WebSocketProtocol):
                 raise ValueError("unsupported compression parameter %r" % key)
         other_side = 'client' if (side == 'server') else 'server'
         self._compressor = _PerMessageDeflateCompressor(
-            **self._get_compressor_options(side, agreed_parameters), compression_options=compression_options)
+            **self._get_compressor_options(side, agreed_parameters, compression_options))
         self._decompressor = _PerMessageDeflateDecompressor(
             **self._get_compressor_options(other_side, agreed_parameters))