openstack/deb-python-autobahn
Code Issues Proposed changes

fxies for Python 2.6

Browse Source
This commit is contained in:
Tobias Oberstein
2014-01-08 15:11:27 +01:00
parent 680b620dfd
commit 34e8926be4
8 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autobahn/autobahn/websocket/protocol.py
View File

@@ -3205,9 +3205,9 @@ class WebSocketServerProtocol(WebSocketProtocol):
""" """
Send out HTTP error response. Send out HTTP error response.
""" """
response = "HTTP/1.1 {} {}\x0d\x0a".format(code, reason) response = "HTTP/1.1 {0} {1}\x0d\x0a".format(code, reason)
for h in responseHeaders: for h in responseHeaders:
response += "{}: {}\x0d\x0a".format(h[0], h[1]) response += "{0}: {1}\x0d\x0a".format(h[0], h[1])
response += "\x0d\x0a" response += "\x0d\x0a"
self.sendData(response.encode('utf8')) self.sendData(response.encode('utf8'))

10
examples/asyncio/websocket/echo/client.py
View File

@@ -1,6 +1,6 @@
############################################################################### ###############################################################################
## ##
## Copyright (C) 2013 Tavendo GmbH ## Copyright (C) 2013-2014 Tavendo GmbH
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ from autobahn.asyncio.websocket import WebSocketClientProtocol, \
class MyClientProtocol(WebSocketClientProtocol): class MyClientProtocol(WebSocketClientProtocol):
def onConnect(self, response): def onConnect(self, response):
print("Server connected: {}".format(response.peer)) print("Server connected: {0}".format(response.peer))
def onOpen(self): def onOpen(self):
print("WebSocket connection open.") print("WebSocket connection open.")
@@ -39,12 +39,12 @@ class MyClientProtocol(WebSocketClientProtocol):
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
if isBinary: if isBinary:
print("Binary message received: {} bytes".format(len(payload))) print("Binary message received: {0} bytes".format(len(payload)))
else: else:
print("Text message received: {}".format(payload.decode('utf8'))) print("Text message received: {0}".format(payload.decode('utf8')))
def onClose(self, wasClean, code, reason): def onClose(self, wasClean, code, reason):
print("WebSocket connection closed: {}".format(reason)) print("WebSocket connection closed: {0}".format(reason))

10
examples/asyncio/websocket/echo/client_coroutines.py
View File

@@ -1,6 +1,6 @@
############################################################################### ###############################################################################
## ##
## Copyright (C) 2013 Tavendo GmbH ## Copyright (C) 2013-2014 Tavendo GmbH
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import asyncio
class MyClientProtocol(WebSocketClientProtocol): class MyClientProtocol(WebSocketClientProtocol):
def onConnect(self, response): def onConnect(self, response):
print("Server connected: {}".format(response.peer)) print("Server connected: {0}".format(response.peer))
@asyncio.coroutine @asyncio.coroutine
def onOpen(self): def onOpen(self):
@@ -40,12 +40,12 @@ class MyClientProtocol(WebSocketClientProtocol):
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
if isBinary: if isBinary:
print("Binary message received: {} bytes".format(len(payload))) print("Binary message received: {0} bytes".format(len(payload)))
else: else:
print("Text message received: {}".format(payload.decode('utf8'))) print("Text message received: {0}".format(payload.decode('utf8')))
def onClose(self, wasClean, code, reason): def onClose(self, wasClean, code, reason):
print("WebSocket connection closed: {}".format(reason)) print("WebSocket connection closed: {0}".format(reason))

10
examples/asyncio/websocket/echo/client_coroutines_py2.py
View File

@@ -1,6 +1,6 @@
############################################################################### ###############################################################################
## ##
## Copyright (C) 2013 Tavendo GmbH ## Copyright (C) 2013-2014 Tavendo GmbH
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import asyncio
class MyClientProtocol(WebSocketClientProtocol): class MyClientProtocol(WebSocketClientProtocol):
def onConnect(self, response): def onConnect(self, response):
print("Server connected: {}".format(response.peer)) print("Server connected: {0}".format(response.peer))
@asyncio.coroutine @asyncio.coroutine
def onOpen(self): def onOpen(self):
@@ -40,12 +40,12 @@ class MyClientProtocol(WebSocketClientProtocol):
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
if isBinary: if isBinary:
print("Binary message received: {} bytes".format(len(payload))) print("Binary message received: {0} bytes".format(len(payload)))
else: else:
print("Text message received: {}".format(payload.decode('utf8'))) print("Text message received: {0}".format(payload.decode('utf8')))
def onClose(self, wasClean, code, reason): def onClose(self, wasClean, code, reason):
print("WebSocket connection closed: {}".format(reason)) print("WebSocket connection closed: {0}".format(reason))

10
examples/asyncio/websocket/echo/server.py
View File

@@ -1,6 +1,6 @@
############################################################################### ###############################################################################
## ##
## Copyright (C) 2013 Tavendo GmbH ## Copyright (C) 2013-2014 Tavendo GmbH
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@@ -23,22 +23,22 @@ from autobahn.asyncio.websocket import WebSocketServerProtocol, \
class MyServerProtocol(WebSocketServerProtocol): class MyServerProtocol(WebSocketServerProtocol):
def onConnect(self, request): def onConnect(self, request):
print("Client connecting: {}".format(request.peer)) print("Client connecting: {0}".format(request.peer))
def onOpen(self): def onOpen(self):
print("WebSocket connection open.") print("WebSocket connection open.")
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
if isBinary: if isBinary:
print("Binary message received: {} bytes".format(len(payload))) print("Binary message received: {0} bytes".format(len(payload)))
else: else:
print("Text message received: {}".format(payload.decode('utf8'))) print("Text message received: {0}".format(payload.decode('utf8')))
## echo back message verbatim ## echo back message verbatim
self.sendMessage(payload, isBinary) self.sendMessage(payload, isBinary)
def onClose(self, wasClean, code, reason): def onClose(self, wasClean, code, reason):
print("WebSocket connection closed: {}".format(reason)) print("WebSocket connection closed: {0}".format(reason))

10
examples/twisted/websocket/echo/client.py
View File

@@ -1,6 +1,6 @@
############################################################################### ###############################################################################
## ##
## Copyright (C) 2011-2013 Tavendo GmbH ## Copyright (C) 2011-2014 Tavendo GmbH
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ from autobahn.twisted.websocket import WebSocketClientProtocol, \
class MyClientProtocol(WebSocketClientProtocol): class MyClientProtocol(WebSocketClientProtocol):
def onConnect(self, response): def onConnect(self, response):
print("Server connected: {}".format(response.peer)) print("Server connected: {0}".format(response.peer))
def onOpen(self): def onOpen(self):
print("WebSocket connection open.") print("WebSocket connection open.")
@@ -39,12 +39,12 @@ class MyClientProtocol(WebSocketClientProtocol):
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
if isBinary: if isBinary:
print("Binary message received: {} bytes".format(len(payload))) print("Binary message received: {0} bytes".format(len(payload)))
else: else:
print("Text message received: {}".format(payload.decode('utf8'))) print("Text message received: {0}".format(payload.decode('utf8')))
def onClose(self, wasClean, code, reason): def onClose(self, wasClean, code, reason):
print("WebSocket connection closed: {}".format(reason)) print("WebSocket connection closed: {0}".format(reason))

10
examples/twisted/websocket/echo/client_coroutines.py
View File

@@ -1,6 +1,6 @@
############################################################################### ###############################################################################
## ##
## Copyright (C) 2011-2013 Tavendo GmbH ## Copyright (C) 2011-2014 Tavendo GmbH
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ def sleep(delay):
class MyClientProtocol(WebSocketClientProtocol): class MyClientProtocol(WebSocketClientProtocol):
def onConnect(self, response): def onConnect(self, response):
print("Server connected: {}".format(response.peer)) print("Server connected: {0}".format(response.peer))
@inlineCallbacks @inlineCallbacks
def onOpen(self): def onOpen(self):
@@ -45,12 +45,12 @@ class MyClientProtocol(WebSocketClientProtocol):
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
if isBinary: if isBinary:
print("Binary message received: {} bytes".format(len(payload))) print("Binary message received: {0} bytes".format(len(payload)))
else: else:
print("Text message received: {}".format(payload.decode('utf8'))) print("Text message received: {0}".format(payload.decode('utf8')))
def onClose(self, wasClean, code, reason): def onClose(self, wasClean, code, reason):
print("WebSocket connection closed: {}".format(reason)) print("WebSocket connection closed: {0}".format(reason))

10
examples/twisted/websocket/echo/server.py
View File

@@ -1,6 +1,6 @@
############################################################################### ###############################################################################
## ##
## Copyright (C) 2011-2013 Tavendo GmbH ## Copyright (C) 2011-2014 Tavendo GmbH
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@@ -23,22 +23,22 @@ from autobahn.twisted.websocket import WebSocketServerProtocol, \
class MyServerProtocol(WebSocketServerProtocol): class MyServerProtocol(WebSocketServerProtocol):
def onConnect(self, request): def onConnect(self, request):
print("Client connecting: {}".format(request.peer)) print("Client connecting: {0}".format(request.peer))
def onOpen(self): def onOpen(self):
print("WebSocket connection open.") print("WebSocket connection open.")
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
if isBinary: if isBinary:
print("Binary message received: {} bytes".format(len(payload))) print("Binary message received: {0} bytes".format(len(payload)))
else: else:
print("Text message received: {}".format(payload.decode('utf8'))) print("Text message received: {0}".format(payload.decode('utf8')))
## echo back message verbatim ## echo back message verbatim
self.sendMessage(payload, isBinary) self.sendMessage(payload, isBinary)
def onClose(self, wasClean, code, reason): def onClose(self, wasClean, code, reason):
print("WebSocket connection closed: {}".format(reason)) print("WebSocket connection closed: {0}".format(reason))