From 17c04157bd8c415b513c8c83fff588e0bf2a4477 Mon Sep 17 00:00:00 2001
From: Alek Storm <alek.storm@gmail.com>
Date: Wed, 16 Nov 2011 15:52:32 -0500
Subject: [PATCH] Expose GzipEncoder through new `encoders` module

---
 vortex/__init__.py | 4 ++--
 vortex/encoders.py | 4 ++++
 vortex/streams.py  | 5 -----
 3 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 vortex/encoders.py
 delete mode 100644 vortex/streams.py

diff --git a/vortex/__init__.py b/vortex/__init__.py
index 9d1ef7a..ae176a1 100644
--- a/vortex/__init__.py
+++ b/vortex/__init__.py
@@ -192,7 +192,7 @@ def __str__(self):
         return b'\r\n'.join(lines) + b'\r\n\r\n'
 
 
-class GzipEncoder(object):
+class _GzipEncoder(object):
     def __init__(self, request, response):
         response.headers['Vary'] = response.headers.get('Vary', '') + ',Accept-Encoding'
         self._accepted = 'gzip' in request.headers.get('Accept-Encoding', '').replace(' ','').split(',')
@@ -218,7 +218,7 @@ def finish(self, data):
 
 
 class HTTPStream(object):
-    def __init__(self, request, response, encoders=[GzipEncoder]):
+    def __init__(self, request, response, encoders=[_GzipEncoder]):
         self._request = request
         self._response = response
         self._buffer = []
diff --git a/vortex/encoders.py b/vortex/encoders.py
new file mode 100644
index 0000000..21196b8
--- /dev/null
+++ b/vortex/encoders.py
@@ -0,0 +1,4 @@
+# All encoders should technically be defined here, but vortex.HTTPStream uses
+# GzipEncoder by default, which would create a circular dependency. Therefore,
+# it's defined in the root module, but exposed publicly here.
+from vortex import _GzipEncoder as GzipEncoder
diff --git a/vortex/streams.py b/vortex/streams.py
deleted file mode 100644
index 896f0ec..0000000
--- a/vortex/streams.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from vortex import HTTPStream
-
-class GzipHTTPStream(HTTPStream):
-    def write(self, data=None):
-        pass