Changeset 368

Timestamp:

08/31/09 05:13:59 (4 years ago)

Author:

xi

Message:

Merged encoding fixes from the trunk.

Location:

pyyaml/tags/3.09

Files:

• ext/_yaml.pyx (modified) (1 diff)
• tests/lib/test_input_output.py (modified) (2 diffs)
• tests/lib3/test_input_output.py (modified) (2 diffs)

pyyaml/tags/3.09/ext/_yaml.pyx

@@ -956 +956 @@
         self.dump_unicode = 0
         if PY_MAJOR_VERSION < 3:
-            if hasattr(stream, 'encoding'):
+            if getattr3(stream, 'encoding', None):
                 self.dump_unicode = 1
         else:

pyyaml/tags/3.09/tests/lib/test_input_output.py

@@ -1 +1 @@
 
 import yaml
-import codecs, StringIO
+import codecs, StringIO, tempfile, os, os.path
 
 def _unicode_open(file, encoding, errors='strict'):
@@ -96 +96 @@
 test_unicode_output.unittest = ['.unicode']
 
+def test_file_output(unicode_filename, verbose=False):
+    data = open(unicode_filename, 'rb').read().decode('utf-8')
+    handle, filename = tempfile.mkstemp()
+    os.close(handle)
+    try:
+        stream = StringIO.StringIO()
+        yaml.dump(data, stream, allow_unicode=True)
+        data1 = stream.getvalue()
+        stream = open(filename, 'wb')
+        yaml.dump(data, stream, allow_unicode=True)
+        stream.close()
+        data2 = open(filename, 'rb').read()
+        stream = open(filename, 'wb')
+        yaml.dump(data, stream, encoding='utf-16-le', allow_unicode=True)
+        stream.close()
+        data3 = open(filename, 'rb').read().decode('utf-16-le')[1:].encode('utf-8')
+        stream = _unicode_open(open(filename, 'wb'), 'utf-8')
+        yaml.dump(data, stream, allow_unicode=True)
+        stream.close()
+        data4 = open(filename, 'rb').read()
+        assert data1 == data2, (data1, data2)
+        assert data1 == data3, (data1, data3)
+        assert data1 == data4, (data1, data4)
+    finally:
+        if os.path.exists(filename):
+            os.unlink(filename)
+
+test_file_output.unittest = ['.unicode']
+
 def test_unicode_transfer(unicode_filename, verbose=False):
     data = open(unicode_filename, 'rb').read().decode('utf-8')

pyyaml/tags/3.09/tests/lib3/test_input_output.py

@@ -1 +1 @@
 
 import yaml
-import codecs, io
+import codecs, io, tempfile, os, os.path
 
 def test_unicode_input(unicode_filename, verbose=False):
@@ -95 +95 @@
 test_unicode_output.unittest = ['.unicode']
 
+def test_file_output(unicode_filename, verbose=False):
+    data = open(unicode_filename, 'rb').read().decode('utf-8')
+    handle, filename = tempfile.mkstemp()
+    os.close(handle)
+    try:
+        stream = io.StringIO()
+        yaml.dump(data, stream, allow_unicode=True)
+        data1 = stream.getvalue()
+        stream = io.BytesIO()
+        yaml.dump(data, stream, encoding='utf-16-le', allow_unicode=True)
+        data2 = stream.getvalue().decode('utf-16-le')[1:]
+        stream = open(filename, 'w', encoding='utf-16-le')
+        yaml.dump(data, stream, allow_unicode=True)
+        stream.close()
+        data3 = open(filename, 'r', encoding='utf-16-le').read()
+        stream = open(filename, 'wb')
+        yaml.dump(data, stream, encoding='utf-8', allow_unicode=True)
+        stream.close()
+        data4 = open(filename, 'r', encoding='utf-8').read()
+        assert data1 == data2, (data1, data2)
+        assert data1 == data3, (data1, data3)
+        assert data1 == data4, (data1, data4)
+    finally:
+        if os.path.exists(filename):
+            os.unlink(filename)
+
+test_file_output.unittest = ['.unicode']
+
 def test_unicode_transfer(unicode_filename, verbose=False):
     data = open(unicode_filename, 'rb').read().decode('utf-8')