Optimized various newline related problems under windows

Author: lin-toto

cyaron/compare.py

@@ -1,9 +1,11 @@
+from __future__ import absolute_import
 from cyaron import IO
+from cyaron.utils import *
 from cyaron.consts import *
 from cyaron.graders import CYaRonGraders
 import subprocess
 import sys
-import io
+from io import open
 
 
 class Compare:
@@ -20,12 +22,12 @@ def __compare_two(name, content, std, grader, **kwargs):
         if stop_on_incorrect and not result:
             if custom_dump_data:
                 (dump_name, dump_lambda) = custom_dump_data
-                with open(dump_name, "w") as f:
+                with open(dump_name, "w", newline='\n') as f:
                     f.write(dump_lambda())
 
-            with open("std.out", "w") as f:
+            with open("std.out", "w", newline='\n') as f:
                 f.write(std)
-            with open("%s.out" % name, "w") as f:
+            with open("%s.out" % name, "w", newline='\n') as f:
                 f.write(content)
 
             print("Relevant files dumped.")
@@ -40,7 +42,7 @@ def __process_file(file):
             file.output_file.seek(0)
             return file.output_filename, file.output_file.read()
         else:
-            with open(file, "r") as f:
+            with open(file, "r", newline='\n') as f:
                 return file, f.read()
 
     @staticmethod
@@ -77,7 +79,7 @@ def program(*args, **kwargs):
             raise Exception("You must specify a std or a std_program.")
         else:
             if "std_program" in kwargs:
-                std = subprocess.check_output(kwargs['std_program'], shell=True, stdin=input.input_file).decode('ascii')
+                std = make_unicode(subprocess.check_output(kwargs['std_program'], shell=True, stdin=input.input_file, universal_newlines=True))
             else:
                 (_, std) = Compare.__process_file(kwargs["std"])
 
@@ -86,7 +88,7 @@ def program(*args, **kwargs):
 
         for program_name in args:
             input.input_file.seek(0)
-            content = subprocess.check_output(program_name, shell=True, stdin=input.input_file)
+            content = make_unicode(subprocess.check_output(program_name, shell=True, stdin=input.input_file, universal_newlines=True))
 
             input.input_file.seek(0)
             Compare.__compare_two(program_name, content, std, grader,

cyaron/graders/fulltext.py

@@ -3,7 +3,7 @@
 
 @CYaRonGraders.grader("FullText")
 def fulltext(content, std):
-    content_hash = hashlib.sha256(content).hexdigest()
-    std_hash = hashlib.sha256(std).hexdigest()
+    content_hash = hashlib.sha256(content.encode('utf-8')).hexdigest()
+    std_hash = hashlib.sha256(std.encode('utf-8')).hexdigest()
     return (True, None) if content_hash == std_hash else (False, "Hash mismatch: read %s, expected %s" % (content_hash, std_hash))
 

cyaron/io.py

@@ -1,4 +1,6 @@
+from __future__ import absolute_import
 from .utils import *
+from io import open
 import subprocess
 import tempfile
 import os
@@ -54,8 +56,8 @@ def __init__(self, *args, **kwargs):
         else:
             raise Exception("Invalid argument count")
 
-        self.input_file = open(self.input_filename, 'w+')
-        self.output_file = open(self.output_filename, 'w+') if self.output_filename else None
+        self.input_file = open(self.input_filename, 'w+', newline='\n')
+        self.output_file = open(self.output_filename, 'w+', newline='\n') if self.output_filename else None
         self.is_first_char = dict()
         if self.file_flag != 0:
             print("Processing %s" % self.input_filename)
@@ -104,9 +106,9 @@ def __write(self, file, *args, **kwargs):
                 self.__write(file, *arg, **kwargs)
             else:
                 if arg != "\n" and not self.is_first_char.get(file, True):
-                    file.write(separator)
+                    file.write(make_unicode(separator))
                 self.is_first_char[file] = False
-                file.write(str(arg))
+                file.write(make_unicode(arg))
                 if arg == "\n":
                     self.is_first_char[file] = True
 
@@ -135,7 +137,7 @@ def output_gen(self, shell_cmd):
         """
         self.input_file.close()
         with open(self.input_filename, 'r') as f:
-            self.output_file.write(subprocess.check_output(shell_cmd, shell=True, stdin=f).decode('ascii'))
+            self.output_file.write(make_unicode(subprocess.check_output(shell_cmd, shell=True, stdin=f, universal_newlines=True)))
 
         self.input_file = open(self.input_filename, 'a+')
         print(self.output_filename, " done")

cyaron/utils.py

@@ -20,4 +20,11 @@ def strtolines(str):
 
     while len(lines) > 0 and len(lines[len(lines) - 1]) == 0:
         del lines[len(lines) - 1]
-    return lines
+    return lines
+
+
+def make_unicode(data):
+    try:
+        return unicode(data)
+    except NameError:
+        return str(data)