From: Ben Darnell Date: Sat, 16 Feb 2013 16:07:23 +0000 (-0500) Subject: Use xrange instead of range on python 2. X-Git-Tag: v3.0.0~122 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b7c4274e2db16cf36407ce8645bc94cdce6d46c;p=thirdparty%2Ftornado.git Use xrange instead of range on python 2. Closes #681. --- diff --git a/tornado/websocket.py b/tornado/websocket.py index 5bb7e1c16..e08d17ed5 100644 --- a/tornado/websocket.py +++ b/tornado/websocket.py @@ -32,6 +32,10 @@ import tornado.web from tornado.log import gen_log, app_log from tornado.util import bytes_type +try: + xrange # py2 +except NameError: + xrange = range # py3 class WebSocketHandler(tornado.web.RequestHandler): """Subclass this class to create a basic WebSocket handler. @@ -586,7 +590,7 @@ class WebSocketProtocol13(WebSocketProtocol): def _on_frame_data(self, data): unmasked = array.array("B", data) - for i in range(len(data)): + for i in xrange(len(data)): unmasked[i] = unmasked[i] ^ self._frame_mask[i % 4] if self._frame_opcode_is_control: