From 49aef205a0264a1ce033f10928fb86c534a85114 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 13 Jun 2011 14:03:22 -0400
Subject: [PATCH] gzip conflict fix

---
 httpbin/filters.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httpbin/filters.py b/httpbin/filters.py
index 8811277..62e491f 100644
--- a/httpbin/filters.py
+++ b/httpbin/filters.py
@@ -7,7 +7,7 @@ httpbin.filters
 This module provides response filter decorators.
 """
 
-import gzip
+import gzip as gzip2
 import json as simplejson
 
 from cStringIO import StringIO
@@ -66,7 +66,7 @@ def gzip(f, *args, **kwargs):
         content = data
 
     gzip_buffer = StringIO()
-    gzip_file = gzip.GzipFile(
+    gzip_file = gzip2.GzipFile(
         mode='wb',
         compresslevel=4,
         fileobj=gzip_buffer