Reduce duplication in Job.import_from_dict

Author: lw

cms/grading/Job.py

@@ -185,6 +185,12 @@ def import_from_dict_with_type(data):
     @classmethod
     def import_from_dict(cls, data):
         """Create a Job from the output of export_to_dict."""
+        data['files'] = dict(
+            (k, File(k, v)) for k, v in iteritems(data['files']))
+        data['managers'] = dict(
+            (k, Manager(k, v)) for k, v in iteritems(data['managers']))
+        data['executables'] = dict(
+            (k, Executable(k, v)) for k, v in iteritems(data['executables']))
         return cls(**data)
 
     @staticmethod
@@ -274,16 +280,6 @@ def export_to_dict(self):
             })
         return res
 
-    @classmethod
-    def import_from_dict(cls, data):
-        data['files'] = dict(
-            (k, File(k, v)) for k, v in iteritems(data['files']))
-        data['managers'] = dict(
-            (k, Manager(k, v)) for k, v in iteritems(data['managers']))
-        data['executables'] = dict(
-            (k, Executable(k, v)) for k, v in iteritems(data['executables']))
-        return cls(**data)
-
     @staticmethod
     def from_submission(operation, submission, dataset):
         """Create a CompilationJob from a submission.
@@ -499,16 +495,6 @@ def export_to_dict(self):
             })
         return res
 
-    @classmethod
-    def import_from_dict(cls, data):
-        data['files'] = dict(
-            (k, File(k, v)) for k, v in iteritems(data['files']))
-        data['managers'] = dict(
-            (k, Manager(k, v)) for k, v in iteritems(data['managers']))
-        data['executables'] = dict(
-            (k, Executable(k, v)) for k, v in iteritems(data['executables']))
-        return cls(**data)
-
     @staticmethod
     def from_submission(operation, submission, dataset):
         """Create an EvaluationJob from a submission.