Fastapi

IM/AppDB.py

@@ -17,10 +17,7 @@
 import os
 import requests
 import xmltodict
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
+from urllib.parse import urlparse
 
 
 class AppDB:

IM/AppDBIS.py

@@ -14,10 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
+from urllib.parse import urlparse
 import requests
 import re
 import time

IM/CloudInfo.py

@@ -15,10 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import json
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
+from urllib.parse import urlparse
 
 
 class CloudInfo:

IM/ConfManager.py

@@ -23,10 +23,7 @@
 import shutil
 from packaging.version import Version
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from io import StringIO
 from multiprocessing import Queue
 
 from ansible import __version__ as ansible_version

IM/FedcloudInfo.py

@@ -16,10 +16,7 @@
 
 import requests
 
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
+from urllib.parse import urlparse
 
 from radl.radl import Feature, system
 

IM/InfrastructureInfo.py

@@ -26,10 +26,7 @@
 from radl.radl_parse import parse_radl
 from radl.radl_json import radlToSimple
 from IM.config import Config
-try:
-    from Queue import PriorityQueue
-except ImportError:
-    from queue import PriorityQueue
+from queue import PriorityQueue
 from IM.VirtualMachine import VirtualMachine
 from IM.auth import Authentication
 from IM.tosca.Tosca import Tosca