Small fixes to the score mode and spool exporter commits

Author: stefano-maggiolo

cms/db/task.py

@@ -194,7 +194,8 @@ class Task(Base):
 
     # Score mode for the task.
     score_mode = Column(
-        Enum(SCORE_MODE_IOI_MAX_TOKENED_LAST, SCORE_MODE_IOI_MAX, name="score_mode"),
+        Enum(SCORE_MODE_IOI_MAX_TOKENED_LAST, SCORE_MODE_IOI_MAX,
+             name="score_mode"),
         nullable=False,
         default=SCORE_MODE_IOI_MAX_TOKENED_LAST)
 

cms/grading/__init__.py

@@ -36,7 +36,9 @@
 
 from sqlalchemy.orm import joinedload
 
-from cms import LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON, LANG_PHP, LANG_JAVA
+from cms import \
+    LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON, LANG_PHP, LANG_JAVA, \
+    SCORE_MODE_IOI_MAX
 from cms.db import Submission
 from cms.grading.Sandbox import Sandbox
 

cmscontrib/SpoolExporter.py

@@ -130,7 +130,8 @@ def export_submissions(self):
             for filename, file_ in submission.files.iteritems():
                 self.file_cacher.get_file_to_path(
                     file_.digest,
-                    os.path.join(submission_dir, filename.replace(".%l", "." + submission.language))
+                    os.path.join(submission_dir,
+                                 filename.replace("%l", submission.language)))
             last_submission_dir = os.path.join(
                 self.upload_dir, username, "%s.%s" %
                 (task, submission.language))

cmsranking/Scoring.py

@@ -219,6 +219,7 @@ def delete_submission(self, key):
     def update_score_mode(self, score_mode):
         self._score_mode = score_mode
 
+
 class ScoringStore(object):
     """A manager for all instances of Scoring.