diff --git a/netlib/tcp.py b/netlib/tcp.py
index f49346a17..b386603c0 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -486,10 +486,10 @@ class TCPServer(object):
         # none.
         if traceback:
             exc = traceback.format_exc()
-            print >> fp, '-'*40
-            print >> fp, "Error in processing of request from %s:%s" % (client_address.host, client_address.port)
-            print >> fp, exc
-            print >> fp, '-'*40
+            print('-' * 40, file=fp)
+            print("Error in processing of request from %s:%s" % (client_address.host, client_address.port), file=fp)
+            print(exc, file=fp)
+            print('-' * 40, file=fp)
 
     def handle_client_connection(self, conn, client_address):  # pragma: no cover
         """
diff --git a/netlib/wsgi.py b/netlib/wsgi.py
index 492803ab3..568b1f9cf 100644
--- a/netlib/wsgi.py
+++ b/netlib/wsgi.py
@@ -9,15 +9,15 @@ class ClientConn:
 
 
 class Flow:
-    def __init__(self, client_conn):
-        self.client_conn = client_conn
+    def __init__(self, address, request):
+        self.client_conn = ClientConn(address)
+        self.request = request
 
 
 class Request:
-    def __init__(self, client_conn, scheme, method, path, headers, content):
+    def __init__(self, scheme, method, path, headers, content):
         self.scheme, self.method, self.path = scheme, method, path
         self.headers, self.content = headers, content
-        self.flow = Flow(client_conn)
 
 
 def date_time_string():
@@ -39,37 +39,37 @@ class WSGIAdaptor:
     def __init__(self, app, domain, port, sversion):
         self.app, self.domain, self.port, self.sversion = app, domain, port, sversion
 
-    def make_environ(self, request, errsoc, **extra):
-        if '?' in request.path:
-            path_info, query = request.path.split('?', 1)
+    def make_environ(self, flow, errsoc, **extra):
+        if '?' in flow.request.path:
+            path_info, query = flow.request.path.split('?', 1)
         else:
-            path_info = request.path
+            path_info = flow.request.path
             query = ''
         environ = {
             'wsgi.version':         (1, 0),
-            'wsgi.url_scheme':      request.scheme,
-            'wsgi.input':           cStringIO.StringIO(request.content),
+            'wsgi.url_scheme':      flow.request.scheme,
+            'wsgi.input':           cStringIO.StringIO(flow.request.content),
             'wsgi.errors':          errsoc,
             'wsgi.multithread':     True,
             'wsgi.multiprocess':    False,
             'wsgi.run_once':        False,
             'SERVER_SOFTWARE':      self.sversion,
-            'REQUEST_METHOD':       request.method,
+            'REQUEST_METHOD':       flow.request.method,
             'SCRIPT_NAME':          '',
             'PATH_INFO':            urllib.unquote(path_info),
             'QUERY_STRING':         query,
-            'CONTENT_TYPE':         request.headers.get('Content-Type', [''])[0],
-            'CONTENT_LENGTH':       request.headers.get('Content-Length', [''])[0],
+            'CONTENT_TYPE':         flow.request.headers.get('Content-Type', [''])[0],
+            'CONTENT_LENGTH':       flow.request.headers.get('Content-Length', [''])[0],
             'SERVER_NAME':          self.domain,
             'SERVER_PORT':          str(self.port),
             # FIXME: We need to pick up the protocol read from the request.
             'SERVER_PROTOCOL':      "HTTP/1.1",
         }
         environ.update(extra)
-        if request.flow.client_conn.address:
-            environ["REMOTE_ADDR"], environ["REMOTE_PORT"] = request.flow.client_conn.address()
+        if flow.client_conn.address:
+            environ["REMOTE_ADDR"], environ["REMOTE_PORT"] = flow.client_conn.address()
 
-        for key, value in request.headers.items():
+        for key, value in flow.request.headers.items():
             key = 'HTTP_' + key.upper().replace('-', '_')
             if key not in ('HTTP_CONTENT_TYPE', 'HTTP_CONTENT_LENGTH'):
                 environ[key] = value
diff --git a/test/test_wsgi.py b/test/test_wsgi.py
index 91a8ff7ad..6e1fb146a 100644
--- a/test/test_wsgi.py
+++ b/test/test_wsgi.py
@@ -2,11 +2,11 @@ import cStringIO, sys
 from netlib import wsgi, odict
 
 
-def treq():
-    cc = wsgi.ClientConn(("127.0.0.1", 8888))
+def tflow():
     h = odict.ODictCaseless()
     h["test"] = ["value"]
-    return wsgi.Request(cc, "http", "GET", "/", h, "")
+    req = wsgi.Request("http", "GET", "/", h, "")
+    return wsgi.Flow(("127.0.0.1", 8888), req)
 
 
 class TestApp:
@@ -24,22 +24,22 @@ class TestApp:
 class TestWSGI:
     def test_make_environ(self):
         w = wsgi.WSGIAdaptor(None, "foo", 80, "version")
-        tr = treq()
-        assert w.make_environ(tr, None)
+        tf = tflow()
+        assert w.make_environ(tf, None)
 
-        tr.path = "/foo?bar=voing"
-        r = w.make_environ(tr, None)
+        tf.request.path = "/foo?bar=voing"
+        r = w.make_environ(tf, None)
         assert r["QUERY_STRING"] == "bar=voing"
 
     def test_serve(self):
         ta = TestApp()
         w = wsgi.WSGIAdaptor(ta, "foo", 80, "version")
-        r = treq()
-        r.host = "foo"
-        r.port = 80
+        f = tflow()
+        f.request.host = "foo"
+        f.request.port = 80
 
         wfile = cStringIO.StringIO()
-        err = w.serve(r, wfile)
+        err = w.serve(f, wfile)
         assert ta.called
         assert not err
 
@@ -49,11 +49,11 @@ class TestWSGI:
 
     def _serve(self, app):
         w = wsgi.WSGIAdaptor(app, "foo", 80, "version")
-        r = treq()
-        r.host = "foo"
-        r.port = 80
+        f = tflow()
+        f.request.host = "foo"
+        f.request.port = 80
         wfile = cStringIO.StringIO()
-        err = w.serve(r, wfile)
+        err = w.serve(f, wfile)
         return wfile.getvalue()
 
     def test_serve_empty_body(self):