Changeset 328 for pyyaml/trunk/tests3/test_reader.py

Timestamp:

12/29/08 12:24:05 (4 years ago)

Author:

xi

Message:

Added basic support for Python 3 (Thanks idadesub(at)users(dot)sourceforge(dot)net).

Location:

pyyaml/trunk/tests3

Files:

• . (copied) (copied from pyyaml/trunk/tests)
• test_reader.py (modified) (3 diffs)

pyyaml/trunk/tests3/test_reader.py

@@ -1 +1 @@
 
 import yaml.reader
-import codecs
 
 def _run_reader(data, verbose):
     try:
         stream = yaml.reader.Reader(data)
-        while stream.peek() != u'\0':
+        while stream.peek() != '\0':
             stream.forward()
-    except yaml.reader.ReaderError, exc:
+    except yaml.reader.ReaderError as exc:
         if verbose:
-            print exc
+            print(exc)
     else:
         raise AssertionError("expected an exception")
@@ -19 +18 @@
     for encoding in ['utf-8', 'utf-16-le', 'utf-16-be']:
         try:
-            data = unicode(open(error_filename, 'rb').read(), encoding)
+            data = open(error_filename, 'rb').read().decode(encoding)
             break
         except UnicodeDecodeError:
@@ -26 +25 @@
         return
     _run_reader(data, verbose)
-    _run_reader(codecs.open(error_filename, encoding=encoding), verbose)
+    _run_reader(open(error_filename, encoding=encoding), verbose)
 
 test_stream_error.unittest = ['.stream-error']