Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:j2labs/brubeck

  • Loading branch information...
commit bb1c0fe8d9387d59e7ecdb4ceaa6cea4110fd904 2 parents e5b4621 + 32705c6
James Dennis authored
Showing with 4 additions and 6 deletions.
  1. +2 −4 brubeck/connections.py
  2. +2 −2 brubeck/request_handling.py
View
6 brubeck/connections.py
@@ -241,7 +241,7 @@ def process_message(self, application, environ, callback):
headers = [(k, v) for k,v in result['headers'].items()]
callback(str(wsgi_status), headers)
- return [result['body']]
+ return [to_bytes(result['body'])]
def recv_forever_ever(self, application):
"""Defines a function that will run the primary connection Brubeck uses
@@ -261,10 +261,8 @@ def proc_msg(environ, callback):
server.serve_forever()
elif CORO_LIBRARY == 'eventlet':
- import eventlet
+ import eventlet.wsgi
server = eventlet.wsgi.server(eventlet.listen(('', self.port)),
proc_msg)
self._recv_forever_ever(fun_forever)
-
-
View
4 brubeck/request_handling.py
@@ -37,8 +37,8 @@ def coro_spawn(function, app, message, *a, **kw):
CORO_LIBRARY = 'eventlet'
- except ImportError: # eventlet or gevent is required.
- raise EnvironmentError('Y U NO INSTALL CONCURRENCY?!')
+ except ImportError:
+ raise EnvironmentError('You need to install eventlet or gevent')
from . import version
Please sign in to comment.
Something went wrong with that request. Please try again.