From 4fecd90b7a7e587bfb8692f85489ce5e3fcd28c3 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Thu, 28 Feb 2019 12:58:13 +0100
Subject: [PATCH] FIX: Resolved problem with premature cherry-picking.

---
 src/caosdb/connection/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/caosdb/connection/connection.py b/src/caosdb/connection/connection.py
index 183a75fd..2c6a884c 100644
--- a/src/caosdb/connection/connection.py
+++ b/src/caosdb/connection/connection.py
@@ -87,7 +87,7 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection):
                 host=self.setup_fields["host"],
                 timeout=self.setup_fields["timeout"],
                 context=self.setup_fields["context"],
-                socket_proxy=self.setup_fields["socket_proxy"])
+            )
             self._http_con.request(method=method, url=self._base_path + path,
                                    headers=headers, body=body)
         except SocketError as socket_err:
-- 
GitLab