Bump version to 5.5.4

Author: Wynndow

Changelog.rst

@@ -3,6 +3,10 @@
 Changelog
 =========
 
+5.5.4 (2018-06-20)
+------------------
+  * Pass retry object instead of False to urllib3
+
 5.5.3 (2018-06-20)
 ------------------
 

elasticsearch5/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-VERSION = (5, 5, 3)
+VERSION = (5, 5, 4)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))
 

elasticsearch5/connection/http_urllib3.py

@@ -1,6 +1,7 @@
 import time
 import urllib3
 from urllib3.exceptions import ReadTimeoutError, SSLError as UrllibSSLError
+from urllib3.util.retry import Retry
 import warnings
 
 CA_CERTS = None
@@ -112,7 +113,19 @@ def perform_request(self, method, url, params=None, body=None, timeout=None, ign
             if not isinstance(method, str):
                 method = method.encode('utf-8')
 
-            response = self.pool.urlopen(method, url, body, retries=False, headers=self.headers, **kw)
+            request_headers = self.headers
+            if headers:
+                request_headers = request_headers.copy()
+                request_headers.update(headers)
+            if self.http_compress and body:
+                try:
+                    body = gzip.compress(body)
+                except AttributeError:
+                    # oops, Python2.7 doesn't have `gzip.compress` let's try
+                    # again
+                    body = gzip.zlib.compress(body)
+
+            response = self.pool.urlopen(method, url, body, retries=Retry(False), headers=request_headers, **kw)
             duration = time.time() - start
             raw_data = response.data.decode('utf-8')
         except Exception as e:

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 import sys
 
-VERSION = (5, 5, 3)
+VERSION = (5, 5, 4)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))