Merge pull request #317 from gkreitz/colorlog_and_small_fixes

Colorlog and small fixes

Author: pehrsoderman

examples/guess/problem.yaml

@@ -4,7 +4,9 @@ source: Kattis
 license: cc by-sa
 
 type: interactive
-name: Guess the Number
+name:
+  en: Guess the Number
+  sv: Gissa talet
 
 # Override standard limits: say that the TLE solutions provided should
 # be at least 4 times above the time limit in order for us to be

examples/oddecho/problem.yaml

@@ -4,4 +4,6 @@ license: cc by-sa
 credits: Johan Sannemo
 source: Principles of Algorithmic Problem Solving
 type: scoring
-name: Odd Echo
+name:
+  en: Odd Echo
+  sv: Udda eko

guess.pdf

@@ -52,6 +52,9 @@ def convert(problem_root: Path, options: argparse.Namespace, statement_file: Pat
 
     renderer.render(doc)
 
+    # Clean up the logger class plasTeX registers, and reset to the default
+    logging.setLoggerClass(logging.Logger)
+
     # Annoying: I have not figured out any way of stopping the plasTeX
     # renderer from generating a .paux file
     if os.path.isfile('.paux'):

problemtools/tex2html.py

@@ -24,6 +24,7 @@
 import uuid
 from pathlib import Path
 
+import colorlog
 import yaml
 
 from . import config
@@ -753,9 +754,13 @@ def check(self, context: Context) -> bool:
         self._check_res = True
 
         if not self.statements:
-            allowed_statements = ', '.join(
-                f'problem.{ext}, problem.[a-z][a-z].{ext}' for ext in self.problem.format.statement_extensions
-            )
+            if self.problem.format is FormatVersion.LEGACY:
+                allowed_statements = ', '.join(
+                    f'problem.{ext}, problem.<language>.{ext}' for ext in self.problem.format.statement_extensions
+                )
+            else:
+                allowed_statements = ', '.join(f'problem.<language>.{ext}' for ext in self.problem.format.statement_extensions)
+
             self.error(
                 f'No problem statements found (expected file of one of following forms in directory {self.problem.format.statement_directory}/: {allowed_statements})'
             )
@@ -1986,8 +1991,8 @@ def argparser() -> argparse.ArgumentParser:
 def initialize_logging(args: argparse.Namespace) -> None:
     ProblemAspect.max_additional_info = args.max_additional_info
 
-    fmt = '%(levelname)s %(message)s'
-    logging.basicConfig(stream=sys.stdout, format=fmt, level=getattr(logging, args.log_level.upper()))
+    fmt = '%(log_color)s%(levelname)s %(message)s'
+    colorlog.basicConfig(stream=sys.stdout, format=fmt, level=getattr(logging, args.log_level.upper()))
 
 
 def main() -> None:

problemtools/verifyproblem.py

@@ -17,6 +17,8 @@ license = "MIT"
 keywords = ["kattis", "problemtools", "icpc", "clics"]
 
 dependencies = [
+    "colorlog",
+    "nh3",
     "PyYAML",
     "plasTeX>=3.0",
     "pydantic>=2.11",

pyproject.toml

@@ -1,3 +1,4 @@
+colorlog
 nh3
 PyYAML
 plasTeX>=3.0