修复bug

Author: himself65

cyaron/compare.py

@@ -15,9 +15,9 @@ def __init__(self, name, mismatch):
         super(CompareMismatch, self).__init__(name, mismatch)
         self.name = name
         self.mismatch = mismatch
-    
+
     def __str__(self):
-        return self.mismatch.__str__()
+        return 'In program: \'{}\'. {}'.format(self.name,self.mismatch)
 
 
 class Compare:
@@ -114,7 +114,10 @@ def program(cls, *programs, **kwargs):
 
         if std_program is not None:
             def get_std():
-                return make_unicode(subprocess.check_output(std_program, shell=(not list_like(std_program)), stdin=input.input_file, universal_newlines=True))
+                with open(os.dup(input.input_file.fileno()), 'r', newline='\n') as input_file:
+                    content =  make_unicode(subprocess.check_output(std_program, shell=(not list_like(std_program)), stdin=input.input_file, universal_newlines=True))
+                    input_file.seek(0)
+                return content
             if job_pool is not None:
                 std = job_pool.submit(get_std).result()
             else:
@@ -138,6 +141,7 @@ def do(program_name):
                     content = make_unicode(subprocess.check_output(program_name, shell=(not list_like(program_name)), stdin=input_file, universal_newlines=True))
                 else:
                     content = make_unicode(subprocess.check_output(program_name, shell=(not list_like(program_name)), stdin=input_file, universal_newlines=True, timeout=timeout))
+                input_file.seek(0)
             cls.__compare_two(program_name, content, std, grader)
 
         if job_pool is not None:

cyaron/graders/noipstyle.py

@@ -24,11 +24,11 @@ def noipstyle(content, std):
                                 std_lines[i][j:j + 5]))
             if len(std_lines[i]) > len(content_lines[i]):
                 return False, TextMismatch(
-                    content, std, 'Too short on line {}.'.format(i), i + 1,
+                    content, std, 'Too short on line {}.'.format(i + 1), 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 {}.'.format(i), i + 1,
+                    content, std, 'Too long on line {}.'.format(i + 1), i + 1,
                     j + 1, content_lines[i][j:j + 5], std_lines[i][j:j + 5])
 
     return True, None