Merge branch 'master' of github.com:Himself65/cyaron

Author: himself65

cyaron/graders/noipstyle.py

@@ -14,11 +14,21 @@ def noipstyle(content, std):
         if std_lines[i] != content_lines[i]:
             for j in range(min(len(std_lines[i]), len(content_lines[i]))):
                 if std_lines[i][j] != content_lines[i][j]:
-                    return (False, TextMismatch(content, std, 'On line {} column {}, read {}, expected {}.',
-                            i + 1, j + 1, content_lines[i][j:j + 5], std_lines[i][j:j + 5]))
+                    return (False,
+                            TextMismatch(
+                                content, std,
+                                'On line {} column {}, read {}, expected {}.'.
+                                format(i + 1, j + 1, content_lines[i][j:j + 5],
+                                       std_lines[i][j:j + 5]), i + 1, j + 1,
+                                content_lines[i][j:j + 5],
+                                std_lines[i][j:j + 5]))
             if len(std_lines[i]) > len(content_lines[i]):
-                return False, TextMismatch(content, std, 'Too short on line {}.', i)
+                return False, TextMismatch(
+                    content, std, 'Too short on line {}.'.format(i), i + 1,
+                    j + 1, content_lines[i][j:j + 5], std_lines[i][j:j + 5])
             if len(std_lines[i]) < len(content_lines[i]):
-                return False, TextMismatch(content, std, 'Too long on line {}.', i)
+                return False, TextMismatch(
+                    content, std, 'Too long on line {}.'.format(i), i + 1,
+                    j + 1, content_lines[i][j:j + 5], std_lines[i][j:j + 5])
 
     return True, None