update code base from python2 to python3

Author: wjia7

maestro/aws/s3.py

@@ -203,7 +203,7 @@ def __parse_kwargs__(self, kwargs):
                 return True
             if len(kwargs) == 0 and self.bucket_name is None and self.source_url is None:
                 return self.help()
-            for key, val in kwargs.iteritems():
+            for key, val in list(kwargs.items()):
                 if key in HELP_KEYS:
                     return self.help()
                 elif key in BUCKET_KEYS:
@@ -324,7 +324,7 @@ def download(self):
         else:
             keyvals[current_key] = None
             current_key = arg.lstrip('-')
-    if current_key is not None and current_key not in keyvals.keys():
+    if current_key is not None and current_key not in list(keyvals.keys()):
         keyvals[current_key] = ""
 
     s3dl = AsyncS3Downloader(None)

maestro/core/execute.py

@@ -1,5 +1,5 @@
-from ioc import SingleObjectContainer
-from module import Module
+from .ioc import SingleObjectContainer
+from .module import Module
 import sys
 
 

maestro/core/ioc.py

@@ -32,7 +32,7 @@ def register(self, id, obj):
         if id is None:
             raise TypeError("You cannot use a None type as an id.")
 
-        if not isinstance(id, basestring):
+        if not isinstance(id, str):
             raise TypeError("You must pass a valid string for the id!")
 
         if self.object_type is None:
@@ -41,7 +41,7 @@ def register(self, id, obj):
         if not isinstance(obj, self.object_type):
             raise TypeError("The object passed to the Container was not of type " + str(self.object_type) + ".")
 
-        if id in self.__objects.keys():
+        if id in list(self.__objects.keys()):
             raise ValueError("ID " + str(id) + " is already registered with this container.")
 
         self.__objects[id] = obj
@@ -51,7 +51,7 @@ def deregister(self, id):
         Deregisters object with id. Will raise ValueError if the id does not exist.
         """
 
-        if id not in self.__objects.keys():
+        if id not in list(self.__objects.keys()):
             raise ValueError("ID " + str(id) + " is not registered with this container.")
 
         del self.__objects[id]
@@ -60,7 +60,7 @@ def getinstance(self, id):
         """
         Returns a new instance of an object with the provided id. The container does not track this object.
         """
-        if id not in self.__objects.keys():
+        if id not in list(self.__objects.keys()):
             raise ValueError("ID " + str(id) + " is not registered with this container.")
         item_type = type(self[id])
 
@@ -70,7 +70,7 @@ def unregister(self, id):
         return self.deregister(id)
 
     def __getitem__(self, id):
-        if id not in self.__objects.keys():
+        if id not in list(self.__objects.keys()):
             raise KeyError("A " + str(self.object_type) + " object with id " + str(id) + " is not registered with this container.")
 
         return self.__objects[id]
@@ -79,4 +79,4 @@ def get(self, id):
         return self.__getitem__(id)
 
     def list(self):
-        return self.__objects.items()
+        return list(self.__objects.items())

maestro/core/module.py

@@ -6,7 +6,7 @@
 Modules are meant to help build modular tools.
 """
 import types
-import copy_reg
+import copyreg
 import sys
 import traceback
 from multiprocessing import Process, log_to_stderr
@@ -70,23 +70,23 @@ def start(self, kwargs={}):
 
     def help(self):
         try:
-            print (self.HELPTEXT)
+            print(self.HELPTEXT)
         except NameError:
-            print ("No help defined for module " + str(type(self)))
+            print("No help defined for module " + str(type(self)))
         return True
 
 
 def __pickle_method__(m):
     """
     Pickling override for using pickle with instance methods.
     """
-    if m.im_self is None:
-        return getattr, (m.im_class, m.im_func.func_name)
+    if m.__self__ is None:
+        return getattr, (m.__self__.__class__, m.__func__.__name__)
     else:
-        return getattr, (m.im_self, m.im_func.func_name)
+        return getattr, (m.__self__, m.__func__.__name__)
 
 
-copy_reg.pickle(types.MethodType, __pickle_method__)
+copyreg.pickle(types.MethodType, __pickle_method__)
 
 
 class AsyncModule(Module):
@@ -129,7 +129,7 @@ def __setup__(self, kwargs):
                 exc.traceback = "".join(traceback.format_exception(*sys.exc_info()))
                 return exc
             except Exception as e:
-                print ("FATAL ERROR -- " + str(e))
+                print("FATAL ERROR -- " + str(e))
 
     def __finish_internal__(self, callback_args):
         """

maestro/tools/path.py

@@ -79,9 +79,9 @@ def symlink(source, link_name):
 def purge(pattern, path, match_directories=False):
     for root, dirs, files in os.walk(path):
         if match_directories is True:
-            for dir in filter(lambda x: re.match(pattern, x), dirs):
+            for dir in [x for x in dirs if re.match(pattern, x)]:
                 shutil.rmtree(os.path.join(root, dir))
-        for file in filter(lambda x: re.match(pattern, x), files):
+        for file in [x for x in files if re.match(pattern, x)]:
             os.remove(os.path.join(root, file))
 
 

maestro/tools/string.py

@@ -5,6 +5,6 @@ def replaceall(replace_dict, string):
     """
     replaceall will take the keys in replace_dict and replace string with their corresponding values. Keys can be regular expressions.
     """
-    replace_dict = dict((re.escape(k), v) for k, v in replace_dict.iteritems())
-    pattern = re.compile("|".join(replace_dict.keys()))
+    replace_dict = dict((re.escape(k), v) for k, v in list(replace_dict.items()))
+    pattern = re.compile("|".join(list(replace_dict.keys())))
     return pattern.sub(lambda m: replace_dict[re.escape(m.group(0))], string)