Merge pull request #2 from rudderlabs/remove-gzip

Author: arnab-p

rudder_analytics/client.py

@@ -27,8 +27,8 @@ class Client(object):
 
     def __init__(self, write_key=None, host='https://hosted.rudderlabs.com', debug=False,
                  max_queue_size=10000, send=True, on_error=None, flush_at=100,
-                 flush_interval=0.5, gzip=False, max_retries=3,
-                 sync_mode=False, timeout=15, thread=1):
+                 flush_interval=0.5, max_retries=3, sync_mode=False,
+                 timeout=15, thread=1):
         require('write_key', write_key, string_types)
 
         self.queue = queue.Queue(max_queue_size)
@@ -38,7 +38,6 @@ def __init__(self, write_key=None, host='https://hosted.rudderlabs.com', debug=F
         self.send = send
         self.sync_mode = sync_mode
         self.host = host
-        self.gzip = gzip
         self.timeout = timeout
 
         if debug:
@@ -60,7 +59,7 @@ def __init__(self, write_key=None, host='https://hosted.rudderlabs.com', debug=F
                 consumer = Consumer(
                     self.queue, write_key, host=host, on_error=on_error,
                     flush_at=flush_at, flush_interval=flush_interval,
-                    gzip=gzip, retries=max_retries, timeout=timeout,
+                    retries=max_retries, timeout=timeout,
                 )
                 self.consumers.append(consumer)
 
@@ -264,8 +263,7 @@ def _enqueue(self, msg):
 
         if self.sync_mode:
             self.log.debug('enqueued with blocking %s.', msg['type'])
-            post(self.write_key, self.host, gzip=self.gzip,
-                 timeout=self.timeout, batch=[msg])
+            post(self.write_key, self.host, timeout=self.timeout, batch=[msg])
 
             return True, msg
 

rudder_analytics/consumer.py

@@ -23,8 +23,7 @@ class Consumer(Thread):
     log = logging.getLogger('rudder')
 
     def __init__(self, queue, write_key, flush_at=100, host=None,
-                 on_error=None, flush_interval=0.5, gzip=False, retries=10,
-                 timeout=15):
+                 on_error=None, flush_interval=0.5, retries=10, timeout=15):
         """Create a consumer thread."""
         Thread.__init__(self)
         # Make consumer a daemon thread so that it doesn't block program exit
@@ -35,7 +34,6 @@ def __init__(self, queue, write_key, flush_at=100, host=None,
         self.host = host
         self.on_error = on_error
         self.queue = queue
-        self.gzip = gzip
         # It's important to set running in the constructor: if we are asked to
         # pause immediately after construction, we might set running to True in
         # run() *after* we set it to False in pause... and keep running
@@ -128,7 +126,6 @@ def fatal_exception(exc):
             max_tries=self.retries + 1,
             giveup=fatal_exception)
         def send_request():
-            post(self.write_key, self.host, gzip=self.gzip,
-                 timeout=self.timeout, batch=batch)
+            post(self.write_key, self.host, timeout=self.timeout, batch=batch)
 
         send_request()

rudder_analytics/request.py

@@ -2,18 +2,16 @@
 from dateutil.tz import tzutc
 import logging
 import json
-from gzip import GzipFile
 from requests.auth import HTTPBasicAuth
 from requests import sessions
-from io import BytesIO
 
 from rudder_analytics.version import VERSION
 from rudder_analytics.utils import remove_trailing_slash
 
 _session = sessions.Session()
 
 
-def post(write_key, host=None, gzip=False, timeout=15, **kwargs):
+def post(write_key, host=None, timeout=15, **kwargs):
     """Post the `kwargs` to the API"""
     log = logging.getLogger('rudder')
     body = kwargs
@@ -26,14 +24,6 @@ def post(write_key, host=None, gzip=False, timeout=15, **kwargs):
         'Content-Type': 'application/json',
         'User-Agent': 'rudderstack-python/' + VERSION
     }
-    if gzip:
-        headers['Content-Encoding'] = 'gzip'
-        buf = BytesIO()
-        with GzipFile(fileobj=buf, mode='w') as gz:
-            # 'data' was produced by json.dumps(),
-            # whose default encoding is utf-8.
-            gz.write(data.encode('utf-8'))
-        data = buf.getvalue()
 
     res = _session.post(url, data=data, auth=auth,
                         headers=headers, timeout=timeout)

rudder_analytics/test/client.py

@@ -310,13 +310,6 @@ def test_identify_with_date_object(self):
 
         self.assertEqual(msg['traits'], {'birthdate': date(1981, 2, 2)})
 
-    def test_gzip(self):
-        client = Client('testsecret', on_error=self.fail, gzip=True)
-        for _ in range(10):
-            client.identify('userId', {'trait': 'value'})
-        client.flush()
-        self.assertFalse(self.failed)
-
     def test_user_defined_flush_at(self):
         client = Client('testsecret', on_error=self.fail,
                         flush_at=10, flush_interval=3)

rudder_analytics/version.py

@@ -1 +1 @@
-VERSION = '1.0.0-beta.1'
+VERSION = '1.0.0-beta.2'