Merge pull request #13 from lextoumbourou/https-support

#11: Allow HTTPS in url.

tests/test_connection_http.py

@@ -16,6 +16,11 @@ def test_prepare_url(self):
         result = _prepare_url('s1', 'index/doc/_search', {'size': 5})
         self.assertTrue(result == 'http://s1/index/doc/_search?size=5')
 
+    def test_prepare_url_handles_ssl(self):
+        result = _prepare_url(
+            'https://s1:443', 'index/doc/_search', {'size': 5})
+        self.assertTrue(result == 'https://s1:443/index/doc/_search?size=5')
+
     @patch('txes2.connection_http.treq')
     @inlineCallbacks
     def test_execute(self, treq_mock):

txes2/connection_http.py

@@ -16,7 +16,7 @@ def _prepare_url(server, path, params):
     if params:
         url = url + '?' + urllib.urlencode(params)
 
-    if not url.startswith("http://"):
+    if not url.startswith(('http:', 'https:')):
         url = "http://" + url
 
     return url.encode('utf-8')

txes2/elasticsearch.py

@@ -16,6 +16,8 @@ def __init__(self, servers='127.0.0.1:9200', timeout=30, bulk_size=400,
                  default_indexes=None, autorefresh=False, *args, **kwargs):
         """
         :param servers: either a single ES server URL or list of servers.
+                        If you don't provide a scheme (eg `https://`) then the
+                        request will use HTTP by default.
         :param int timeout: connection timeout in seconds.
         :param int bulk_size: how much bulk data to accumulate before indexing
                               (when indexing in bulk).