Fixing for python2

Author: Robin-Van-de-Merghel

Pilot/proxyTools.py

@@ -9,6 +9,10 @@
 import sys
 import os
 
+try:
+    IsADirectoryError  # pylint: disable=used-before-assignment
+except NameError:
+    IsADirectoryError = OSError
 
 try:
     from urllib.parse import urlencode
@@ -22,7 +26,7 @@
 VOMS_FQANS_OID = b"1.3.6.1.4.1.8005.100.100.4"
 VOMS_EXTENSION_OID = b"1.3.6.1.4.1.8005.100.100.5"
 
-RE_OPENSSL_ANS1_FORMAT = re.compile(rb"^\s*\d+:d=(\d+)\s+hl=")
+RE_OPENSSL_ANS1_FORMAT = re.compile(br"^\s*\d+:d=(\d+)\s+hl=")
 
 
 def parseASN1(data):
@@ -42,7 +46,7 @@ def findExtension(oid, lines):
 
 def getVO(proxy_data):
 
-    chain = re.findall(rb"-----BEGIN CERTIFICATE-----\n.+?\n-----END CERTIFICATE-----", proxy_data, flags=re.DOTALL)
+    chain = re.findall(br"-----BEGIN CERTIFICATE-----\n.+?\n-----END CERTIFICATE-----", proxy_data, flags=re.DOTALL)
     for cert in chain:
         proc = Popen(["openssl", "x509", "-outform", "der"], stdin=PIPE, stdout=PIPE)
         out, _ = proc.communicate(cert)
@@ -62,13 +66,13 @@ def getVO(proxy_data):
             if depth <= initial_depth:
                 break
             # Look for a role, if it exists the VO is the first element
-            match = re.search(rb"OCTET STRING\s+:/([a-zA-Z0-9]+)/Role=", line)
+            match = re.search(br"OCTET STRING\s+:/([a-zA-Z0-9]+)/Role=", line)
             if match:
                 return match.groups()[0].decode()
     raise NotImplementedError("Something went very wrong")
 
 
-class BaseConnectedRequest:
+class BaseConnectedRequest(object):
     """This class helps supporting multiple kinds of requests that requires connections"""
 
     def __init__(self, url, caPath, name="unknown"):
@@ -126,21 +130,21 @@ class TokenBasedRequest(BaseConnectedRequest):
     """Connected Request with JWT support"""
 
     def __init__(self, url, caPath, jwtData):
-        super().__init__(url, caPath, "TokenBasedConnection")
+        super(TokenBasedRequest, self).__init__(url, caPath, "TokenBasedConnection")
 
         self.jwtData = jwtData
 
     def executeRequest(self, raw_data, headers={"User-Agent": "Dirac Pilot [Unknown ID]"}):
         # Adds the JWT in the HTTP request (in the Bearer field)
         headers["Bearer"] = self.jwtData
-        return super().executeRequest(raw_data, headers)
+        return super(TokenBasedRequest, self).executeRequest(raw_data, headers)
 
 
 class X509BasedRequest(BaseConnectedRequest):
     """Connected Request with X509 support"""
 
     def __init__(self, url, caPath, certEnv):
-        super().__init__(url, caPath, "X509BasedConnection")
+        super(X509BasedRequest, self).__init__(url, caPath, "X509BasedConnection")
 
         self.certEnv = certEnv
         self._hasExtraCredentials = False
@@ -158,4 +162,4 @@ def executeRequest(self, raw_data, headers={"User-Agent": "Dirac Pilot [Unknown
         # Adds a flag if the passed cert is a Directory
         if self._hasExtraCredentials:
             raw_data["extraCredentials"] = '"hosts"'
-        return super().executeRequest(raw_data, headers)
+        return super(X509BasedRequest, self).executeRequest(raw_data, headers)