fix: Small fixes

Author: Robin-Van-de-Merghel

Pilot/pilotTools.py

@@ -687,7 +687,7 @@ def cancelTimer(self):
             self._timer.cancel()
 
 
-def sendMessage(url, pilotUUID, wnVO, method, rawMessage, withJWT=False):
+def sendMessage(url, pilotUUID, wnVO, method, rawMessage, withJWT=False, jwt={}):
     """
     Invoke a remote method on a Tornado server and pass a JSON message to it.
 
@@ -697,6 +697,7 @@ def sendMessage(url, pilotUUID, wnVO, method, rawMessage, withJWT=False):
     :param str method: a method to be invoked
     :param str rawMessage: a message to be sent, in JSON format
     :param bool withJWT: tells if we use or not JWT
+    :param dict jwt: JWT for the requests
     :return: None.
     """
 
@@ -708,12 +709,15 @@ def sendMessage(url, pilotUUID, wnVO, method, rawMessage, withJWT=False):
     config = None
 
     if withJWT:
-        jwtData = os.getenv("JWT_TOKEN")
+        try:
+            access_token = jwt["access_token"]
+        except ValueError as e:
+            raise ValueError("JWT is needed, with an access_token field")
 
         config = TokenBasedRequest(
             url=url,
             caPath=caPath,
-            jwtData=jwtData
+            jwtData=access_token
         )
 
     else:
@@ -1141,10 +1145,10 @@ def __checkSecurityDir(self, envName, dirName):
 
     def __retrieveIfNeededJWT(self):
 
-        if self.diracXServer != "":
-            if self.pilotSecret == "":
+        if self.diracXServer:
+            if not self.pilotSecret:
                 raise ValueError("PilotSecret has to be defined")
-            if self.pilotUUID == "":
+            if not self.pilotUUID:
                 raise ValueError("PilotUUID has to be defined")
             self.jwt = retrieveJWT(self.diracXServer, self.pilotUUID, self.pilotSecret)
             self.log.debug("Retrieved JWT from DiracX")

Pilot/proxyTools.py

@@ -124,7 +124,7 @@ def executeRequest(self, raw_data, insecure=False):
         :return: Parsed JSON response
         :rtype: dict
         """    
-        if sys.version_info[0] == 3:
+        if sys.version_info.major == 3:
             data = urlencode(raw_data).encode("utf-8")  # encode to bytes ! for python3
         else:
             # Python2
@@ -141,15 +141,15 @@ def executeRequest(self, raw_data, insecure=False):
             ctx.check_hostname = False
             ctx.verify_mode = ssl.CERT_NONE
 
-        if sys.version_info[0] >= 3:
+        if sys.version_info.major == 3:
             # Python 3 code
             with urlopen(request, context=ctx) as res:
                 response_data = res.read().decode("utf-8")  # Decode response bytes
         else:
             # Python 2 code
             res = urlopen(request, context=ctx)
             try:
-                response_data = res.read().decode("utf-8")  # Decode response bytes
+                response_data = res.read()
             finally:
                 res.close()