commit 01aee4a0dc481aa40ed5d8d0532eea7daec43441
author datadiode <jochen.neubeck@vodafone.de> Sun Jan 11 10:39:24 2015 +0100
committer Christopher Dunn <cdunn2001@gmail.com> Fri Jan 16 09:57:42 2015 -0600
tree fea8e373a8180902750d89740c2c8ffcceab42cd
parent 59a01652abaec8f50a861f25f3c4183baed067b6

Fix Python test scripts for Python 3 and Windows

test/runjsontests.py

diff --git a/test/runjsontests.py b/test/runjsontests.py
index 9422d57..62e5600 100644
--- a/test/runjsontests.py
+++ b/test/runjsontests.py
@@ -34,7 +34,7 @@
         
 def safeReadFile( path ):
     try:
-        return file( path, 'rt' ).read()
+        return open( path, 'rt', encoding = 'utf-8' ).read()
     except IOError as e:
         return '<File "%s" is missing: %s>' % (path,e)
 
@@ -77,13 +77,13 @@
             base_path = os.path.splitext(input_path)[0]
             actual_output = safeReadFile( base_path + '.actual' )
             actual_rewrite_output = safeReadFile( base_path + '.actual-rewrite' )
-            file(base_path + '.process-output','wt').write( process_output )
+            open(base_path + '.process-output', 'wt', encoding = 'utf-8').write( process_output )
             if status:
                 print('parsing failed')
                 failed_tests.append( (input_path, 'Parsing failed:\n' + process_output) )
             else:
                 expected_output_path = os.path.splitext(input_path)[0] + '.expected'
-                expected_output = file( expected_output_path, 'rt' ).read()
+                expected_output = open( expected_output_path, 'rt', encoding = 'utf-8' ).read()
                 detail = ( compareOutputs( expected_output, actual_output, 'input' )
                             or compareOutputs( expected_output, actual_rewrite_output, 'rewrite' ) )
                 if detail: