Merge pull request #34 from mikhail-hul/master

Version set to 1.5
Fitbit · Dec 22, 2020 · efa6894 · efa6894
2 parents 3ee288b + 9b0ce63
commit efa6894
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,6 @@
 language: python
+python:
+  - "2.7"
 install:
   - pip install .
   - pip install coveralls

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 config = {
     'name': 'thriftcli',
-    'version': 1.4,
+    'version': 1.5,
     'description': 'Thrift CLI',
     'author': 'Neel Virdy',
     'packages': ['thriftcli'],

diff --git a/tests/test_thrift_executor.py b/tests/test_thrift_executor.py
@@ -74,7 +74,7 @@ def test_init_ssl(self, mock_load_file, mock_call, mock_import_package, mock_tso
         command = 'thrift -r -I . --gen py %s' % data.TEST_THRIFT_FILE
         mock_call.assert_called_with(command, shell=True)
         mock_import_package.assert_called_with(data.TEST_THRIFT_MODULE_NAME, data.TEST_THRIFT_PY_NAMESPACE)
-        mock_tsocket.assert_called_with(data.TEST_SERVER_HOSTNAME, data.TEST_SERVER_PORT,ssl_context=mock.ANY)
+        mock_tsocket.assert_called_with(data.TEST_SERVER_HOSTNAME, data.TEST_SERVER_PORT,ca_certs=None,validate_callback=mock.ANY)
         self.assertTrue(mock_transport_open.called)
         mock_finagle_protocol.assert_called()
 

diff --git a/thriftcli/thrift_executor.py b/thriftcli/thrift_executor.py
@@ -150,7 +150,7 @@ def _open_connection(self, address):
                 ssl_context.verify_mode = verifier_type
                 self._transport = TSSLSocket.TSSLSocket(url, port, ca_certs=self._tls_key_path,
                                                         validate_callback=lambda cert, hostname: None)  # disabling hostname validation
-    else:
+        else:
             if self._proxy:
                 proxy_host, proxy_port = self._proxy.split(":")
                 self._transport = TProxySocket(proxy_host, proxy_port, url, port)