Do not escape the global request_timeout param

Thanks EyePulp for the report!

Author: honzakral

elasticsearch/client/utils.py

@@ -46,7 +46,7 @@ def _make_path(*parts):
         quote_plus(_escape(p), b',*') for p in parts if p not in SKIP_IN_PATH)
 
 # parameters that apply to all methods
-GLOBAL_PARAMS = ('pretty', 'format', 'request_timeout')
+GLOBAL_PARAMS = ('pretty', 'format')
 
 def query_params(*es_query_params):
     """
@@ -61,9 +61,10 @@ def _wrapped(*args, **kwargs):
                 if p in kwargs:
                     params[p] = _escape(kwargs.pop(p))
 
-            # don't treat ignore as other params to avoid escaping
-            if 'ignore' in kwargs:
-                params['ignore'] = kwargs.pop('ignore')
+            # don't treat ignore and request_timeout as other params to avoid escaping
+            for p in ('ignore', 'request_timeout'):
+                if p in kwargs:
+                    params[p] = kwargs.pop(p)
             return func(*args, params=params, **kwargs)
         return _wrapped
     return _wrapper

test_elasticsearch/test_client/__init__.py

@@ -39,6 +39,11 @@ def test_single_string_is_wrapped_in_list(self):
 
 
 class TestClient(ElasticsearchTestCase):
+    def test_request_timeout_is_passed_through_unescaped(self):
+        self.client.ping(request_timeout=.1)
+        calls = self.assert_url_called('HEAD', '/')
+        self.assertEquals([({'request_timeout': .1}, None)], calls)
+
     def test_from_in_search(self):
         self.client.search(index='i', doc_type='t', from_=10)
         calls = self.assert_url_called('GET', '/i/t/_search')