Pylint suggestions

Author: stefano-maggiolo

cms/grading/TaskType.py

@@ -152,7 +152,7 @@ def name(self):
 
         """
         # de-CamelCase the name, capitalize it and return it
-        return re.sub("([A-Z])", " \g<1>",
+        return re.sub("([A-Z])", r" \g<1>",
                       self.__class__.__name__).strip().capitalize()
 
     testable = True

cms/server/ContestWebServer.py

@@ -739,7 +739,7 @@ def get(self, task_name, submission_num, filename):
             else:
                 # We don't recognize this filename. Let's try to 'undo'
                 # the '%l' -> 'c|cpp|pas' replacement before giving up.
-                filename = re.sub('\.%s$' % submission.language, '.%l',
+                filename = re.sub(r'\.%s$' % submission.language, '.%l',
                                   filename)
 
         if filename not in submission.files:

cmscontrib/ContestExporter.py

@@ -132,8 +132,8 @@ def __init__(self, contest_id, export_target,
                     self.contest_id = None
                 else:
                     self.export_target = "dump_%s.tar.gz" % contest.name
-                    logger.warning("export_target not given, using \"%s\""
-                                   % self.export_target)
+                    logger.warning("export_target not given, using \"%s\"",
+                                   self.export_target)
 
         self.file_cacher = FileCacher()
 
@@ -332,16 +332,16 @@ def safe_get_file(self, digest, path, descr_path=None):
         # First get the file
         try:
             self.file_cacher.get_file_to_path(digest, path)
-        except Exception as error:
-            logger.error("File %s could not retrieved from file server (%r)."
-                         % (digest, error))
+        except Exception:
+            logger.error("File %s could not retrieved from file server.",
+                         digest, exc_info=True)
             return False
 
         # Then check the digest
         calc_digest = sha1sum(path)
         if digest != calc_digest:
-            logger.critical("File %s has wrong hash %s."
-                            % (digest, calc_digest))
+            logger.critical("File %s has wrong hash %s.",
+                            digest, calc_digest)
             return False
 
         # If applicable, retrieve also the description

cmscontrib/ContestImporter.py

@@ -121,7 +121,7 @@ def do_import(self):
 
             file_names = os.listdir(self.import_dir)
             if len(file_names) != 1:
-                logger.critical("Cannot find a root directory in %s." %
+                logger.critical("Cannot find a root directory in %s.",
                                 self.import_source)
                 archive.cleanup()
                 return False
@@ -136,8 +136,8 @@ def do_import(self):
                                     "and recreating the database.",
                                     exc_info=True)
                     return False
-            except Exception as error:
-                logger.critical("Unable to access DB.\n%r" % error)
+            except Exception:
+                logger.critical("Unable to access DB.", exc_info=True)
                 return False
 
         with SessionGen() as session:
@@ -168,8 +168,8 @@ def do_import(self):
                         "version %d). It may take a while to adapt it to "
                         "the current data model (which is version %d). You "
                         "can use cmsDumpUpdater to update the on-disk dump "
-                        "and speed up future imports."
-                        % (dump_version, model_version))
+                        "and speed up future imports.",
+                        dump_version, model_version)
 
                 if dump_version > model_version:
                     logger.critical(
@@ -179,7 +179,7 @@ def do_import(self):
                         "way to adapt it to the current data model (which "
                         "is version %d). You probably need to update CMS to "
                         "handle it. It is impossible to proceed with the "
-                        "importation." % (dump_version, model_version))
+                        "importation.", dump_version, model_version)
                     return False
 
                 for version in range(dump_version, model_version):
@@ -279,7 +279,7 @@ def do_import(self):
                     if not self.safe_put_file(file_, desc):
                         logger.critical("Unable to put file `%s' in the DB. "
                                         "Aborting. Please remove the contest "
-                                        "from the database." % file_)
+                                        "from the database.", file_)
                         # TODO: remove contest from the database.
                         return False
 
@@ -288,7 +288,7 @@ def do_import(self):
             archive.cleanup()
 
         if contest_id is not None:
-            logger.info("Import finished (contest id: %s)." %
+            logger.info("Import finished (contest id: %s).",
                         ", ".join("%d" % id_ for id_ in contest_id))
         else:
             logger.info("Import finished.")
@@ -413,14 +413,14 @@ def safe_put_file(self, path, descr_path):
             digest = self.file_cacher.put_file_from_path(path, description)
         except Exception as error:
             logger.critical("File %s could not be put to file server (%r), "
-                            "aborting." % (path, error))
+                            "aborting.", path, error)
             return False
 
         # Then check the digest.
         calc_digest = sha1sum(path)
         if digest != calc_digest:
             logger.critical("File %s has hash %s, but the server returned %s, "
-                            "aborting." % (path, calc_digest, digest))
+                            "aborting.", path, calc_digest, digest)
             return False
 
         return True

cmscontrib/Importer.py

@@ -82,8 +82,8 @@ def _prepare_db(self):
                                     "recreating the database.",
                                     exc_info=True)
                     return False
-            except Exception as error:
-                logger.critical("Unable to access DB.\n%r" % error)
+            except Exception:
+                logger.critical("Unable to access DB.", exc_info=True)
                 return False
         return True
 
@@ -104,7 +104,7 @@ def do_import(self):
             for user in users:
                 contest.users.append(self.loader.get_user(user))
         else:
-            logger.info("Generating %s random users." % self.user_number)
+            logger.info("Generating %s random users.", self.user_number)
             contest.users = [User("User %d" % i,
                                   "Last name %d" % i,
                                   "user%03d" % i)
@@ -129,7 +129,7 @@ def do_import(self):
             session.commit()
             contest_id = contest.id
 
-        logger.info("Import finished (new contest id: %s)." % contest_id)
+        logger.info("Import finished (new contest id: %s).", contest_id)
 
 
 def main():

cmscontrib/RWSHelper.py

@@ -131,8 +131,8 @@ def main():
 
     if args.verbose:
         verb = args.action[:4] + 'ting'
-        logger.info("%s entity '%ss/%s'" % (verb.capitalize(),
-                                            args.entity_type, args.entity_id))
+        logger.info("%s entity '%ss/%s'", verb.capitalize(),
+                    args.entity_type, args.entity_id)
 
     if args.rankings is not None:
         shards = args.rankings
@@ -149,9 +149,8 @@ def main():
         auth = urlsplit(url)
 
         if args.verbose:
-            logger.info(
-                "Preparing %s request to %s" %
-                (ACTION_METHODS[args.action], url))
+            logger.info("Preparing %s request to %s",
+                        ACTION_METHODS[args.action], url)
 
         if hasattr(args, 'file'):
             if args.verbose:
@@ -169,17 +168,16 @@ def main():
 
         try:
             res = s.send(req, verify=config.https_certfile)
-        except RequestException as error:
-            logger.error("Failed")
-            logger.info(repr(error))
+        except RequestException:
+            logger.error("Failed", exc_info=True)
             had_error = True
             continue
 
         if args.verbose:
             logger.info("Response received")
 
         if 400 <= res.status_code < 600:
-            logger.error("Unexpected status code: %d" % res.status_code)
+            logger.error("Unexpected status code: %d", res.status_code)
             had_error = True
             continue
 

cmscontrib/Reimporter.py

@@ -238,23 +238,23 @@ def do_reimport(self):
 
                 if old_user is None:
                     # Create a new user.
-                    logger.info("Creating user %s" % username)
+                    logger.info("Creating user %s", username)
                     new_user = self.loader.get_user(username)
                     old_contest.users.append(new_user)
                 elif username in new_users:
                     # Update an existing user.
-                    logger.info("Updating user %s" % username)
+                    logger.info("Updating user %s", username)
                     new_user = self.loader.get_user(username)
                     self._update_object(old_user, new_user)
                 else:
                     # Delete an existing user.
                     if self.force:
-                        logger.info("Deleting user %s" % username)
+                        logger.info("Deleting user %s", username)
                         old_contest.users.remove(old_user)
                     else:
                         logger.critical(
                             "User %s exists in old contest, but "
-                            "not in the new one. Use -f to force." %
+                            "not in the new one. Use -f to force.",
                             username)
                         return False
 
@@ -271,34 +271,34 @@ def do_reimport(self):
 
                 if old_task is None:
                     # Create a new task.
-                    logger.info("Creating task %s" % task)
+                    logger.info("Creating task %s", task)
                     new_task = self.loader.get_task(task)
                     new_task.num = current_num
                     current_num += 1
                     old_contest.tasks.append(new_task)
                 elif task in new_tasks:
                     # Update an existing task.
                     if self.full or self.loader.has_changed(task):
-                        logger.info("Updating task %s" % task)
+                        logger.info("Updating task %s", task)
                         new_task = self.loader.get_task(task)
                         new_task.num = current_num
                         current_num += 1
                         self._update_object(old_task, new_task)
                     else:
-                        logger.info("Task %s has not changed" % task)
+                        logger.info("Task %s has not changed", task)
                         # Even unchanged tasks should use a temporary number
                         # to avoid duplicate numbers when we fix them.
                         old_task.num = current_num
                         current_num += 1
                 else:
                     # Delete an existing task.
                     if self.force:
-                        logger.info("Deleting task %s" % task)
+                        logger.info("Deleting task %s", task)
                         session.delete(old_task)
                     else:
                         logger.critical(
                             "Task %s exists in old contest, but "
-                            "not in the new one. Use -f to force." %
+                            "not in the new one. Use -f to force.",
                             task)
                         return False
 
@@ -315,7 +315,7 @@ def do_reimport(self):
 
             session.commit()
 
-        logger.info("Reimport finished (contest id: %s)." %
+        logger.info("Reimport finished (contest id: %s).",
                     self.old_contest_id)
 
         return True

cmscontrib/SpoolExporter.py

@@ -117,7 +117,7 @@ def export_submissions(self):
         queue_file = io.open(os.path.join(self.spool_dir, "queue"), "w",
                              encoding="utf-8")
         for submission in sorted(self.submissions, key=lambda x: x.timestamp):
-            logger.info("Exporting submission %s." % submission.id)
+            logger.info("Exporting submission %s.", submission.id)
             username = submission.user.username
             task = submission.task.name
             timestamp = time.mktime(submission.timestamp.timetuple())

cmscontrib/YamlLoader.py

@@ -139,7 +139,7 @@ def get_contest(self):
             io.open(os.path.join(self.path, "contest.yaml"),
                     "rt", encoding="utf-8"))
 
-        logger.info("Loading parameters for contest %s." % name)
+        logger.info("Loading parameters for contest %s.", name)
 
         args = {}
 
@@ -280,14 +280,14 @@ def has_changed(self, name):
 
         if os.path.exists(os.path.join(path, ".import_error")):
             logger.warning("Last attempt to import task %s failed,"
-                           " I'm not trying again." % name)
+                           " I'm not trying again.", name)
         return False
 
     def get_user(self, username):
         """See docstring in class Loader.
 
         """
-        logger.info("Loading parameters for user %s." % username)
+        logger.info("Loading parameters for user %s.", username)
         conf = self.users_conf[username]
         assert username == conf['username']
 
@@ -339,7 +339,7 @@ def get_task(self, name):
                 io.open(os.path.join(self.path, name + ".yaml"),
                         "rt", encoding="utf-8"))
 
-        logger.info("Loading parameters for task %s." % name)
+        logger.info("Loading parameters for task %s.", name)
 
         # Here we update the time of the last import
         touch(os.path.join(task_path, ".itime"))
@@ -473,7 +473,7 @@ def get_task(self, name):
                     args["managers"] += [
                         Manager("grader.%s" % lang, digest)]
                 else:
-                    logger.warning("Grader for language %s not found " % lang)
+                    logger.warning("Grader for language %s not found ", lang)
             # Read managers with other known file extensions
             for other_filename in os.listdir(os.path.join(task_path, "sol")):
                 if any(other_filename.endswith(header)
@@ -619,7 +619,7 @@ def get_task(self, name):
                                 Manager("stub.%s" % lang, digest)]
                         else:
                             logger.warning("Stub for language %s not "
-                                           "found." % lang)
+                                           "found.", lang)
                     for other_filename in os.listdir(os.path.join(task_path,
                                                                   "sol")):
                         if any(other_filename.endswith(header) for header in

cmsranking/Scoring.py

@@ -165,10 +165,10 @@ def create_subchange(self, key, subchange):
                     break
             self.reset_history()
             logger.info("Reset history for user '%s' and task '%s' after "
-                        "creating subchange '%s' for submission '%s'" %
-                        (self._submissions[subchange.submission].user,
-                         self._submissions[subchange.submission].task,
-                         key, subchange.submission))
+                        "creating subchange '%s' for submission '%s'",
+                        self._submissions[subchange.submission].user,
+                        self._submissions[subchange.submission].task,
+                        key, subchange.submission)
 
     def update_subchange(self, key, subchange):
         # Update the subchange inside the (sorted) list and,
@@ -178,17 +178,17 @@ def update_subchange(self, key, subchange):
                 self._changes[i] = subchange
         self.reset_history()
         logger.info("Reset history for user '%s' and task '%s' after "
-                    "creating subchange '%s' for submission '%s'" %
-                    (self._submissions[subchange.submission].user,
-                     self._submissions[subchange.submission].task,
-                     key, subchange.submission))
+                    "creating subchange '%s' for submission '%s'",
+                    self._submissions[subchange.submission].user,
+                    self._submissions[subchange.submission].task,
+                    key, subchange.submission)
 
     def delete_subchange(self, key):
         # Delete the subchange from the (sorted) list and reset the
         # history.
         self._changes = filter(lambda a: a.key != key, self._changes)
         self.reset_history()
-        logger.info("Reset history after deleting subchange '%s'" % key)
+        logger.info("Reset history after deleting subchange '%s'", key)
 
     def create_submission(self, key, submission):
         # A new submission never triggers an update in the history,