From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 17 Jul 2011 22:17:36 +0000 (-0700)
Subject: Change binary literals to hex for compatibility with python2.5
X-Git-Tag: v2.1.0~78^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=379cd3d60919b20d76c2d0fa4f66b24a5a485aff;p=thirdparty%2Ftornado.git

Change binary literals to hex for compatibility with python2.5
---

diff --git a/tornado/websocket.py b/tornado/websocket.py
index 00ae0d805..d500e431b 100644
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -382,7 +382,7 @@ class WebSocketProtocol8(WebSocketProtocol):
 
     def _write_frame(self, fin, opcode, data):
         if fin:
-            finbit = 0b10000000
+            finbit = 0x80
         else:
             finbit = 0
         frame = struct.pack("B", finbit | opcode)
@@ -414,12 +414,12 @@ class WebSocketProtocol8(WebSocketProtocol):
 
     def _on_frame_start(self, data):
         header, payloadlen = struct.unpack("BB", data)
-        self._final_frame = header & 0b10000000
-        self._frame_opcode = header & 0b1111
-        if not (payloadlen & 0b10000000):
+        self._final_frame = header & 0x80
+        self._frame_opcode = header & 0xf
+        if not (payloadlen & 0x80):
             # Unmasked frame -> abort connection
             self._abort()
-        payloadlen = payloadlen & 0b1111111
+        payloadlen = payloadlen & 0x7f
         if payloadlen < 126:
             self._frame_length = payloadlen
             self.stream.read_bytes(4, self._on_masking_key)