Added support for https - nodes

VAMDC · Feb 13, 2019 · a7cfa54 · a7cfa54
1 parent 959b37e
commit a7cfa54
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/request.py b/request.py
@@ -19,7 +19,7 @@
 import nodes
 
 from urlparse import urlparse
-from httplib import HTTPConnection, urlsplit, HTTPException, socket
+from httplib import HTTPConnection, HTTPSConnection, urlsplit, HTTPException, socket
 
 from dateutil.parser import parse
 
@@ -132,7 +132,10 @@ def dorequest(self, timeout = TIMEOUT, HttpMethod = "POST", parsexsams = True):
         url = self.baseurl + self.querypath
         urlobj = urlsplit(url)
 
-        conn = HTTPConnection(urlobj.netloc, timeout = timeout)
+        if urlobj.scheme == 'https':
+            conn = HTTPSConnection(urlobj.netloc, timeout = timeout)
+        else:
+            conn = HTTPConnection(urlobj.netloc, timeout = timeout)
         conn.putrequest(HttpMethod, urlobj.path+"?"+urlobj.query)
         conn.endheaders()
 
@@ -181,8 +184,11 @@ def doheadrequest(self, timeout = TIMEOUT):
 
         url = self.baseurl + self.querypath
         urlobj = urlsplit(url)
-
-        conn = HTTPConnection(urlobj.netloc, timeout = timeout)
+
+        if urlobj.scheme == 'https':
+            conn = HTTPSConnection(urlobj.netloc, timeout = timeout)
+        else:
+            conn = HTTPConnection(urlobj.netloc, timeout = timeout)
         conn.putrequest("HEAD", urlobj.path+"?"+urlobj.query)
         conn.endheaders()
 

diff --git a/results.py b/results.py
@@ -16,7 +16,6 @@
 import query as q
 
 from urlparse import urlparse
-from httplib import HTTPConnection
 
 from dateutil.parser import parse