Changeset 335

Timestamp:

12/30/08 09:55:47 (4 years ago)

Author:

xi

Message:

Minor compatibility fixes.

Location:

pyyaml/trunk

Files:

• ext/_yaml.h (modified) (1 diff)
• setup.cfg (modified) (1 diff)
• tests/lib/test_input_output.py (modified) (1 diff)

pyyaml/trunk/ext/_yaml.h

@@ -4 +4 @@
 #if PY_MAJOR_VERSION < 3
 
-#define PyUnicode_FromString(s) PyUnicode_DecodeUTF8((s), strlen(s), 'strict')
+#define PyUnicode_FromString(s) PyUnicode_DecodeUTF8((s), strlen(s), "strict")
 
 #else

pyyaml/trunk/setup.cfg

@@ -34 +34 @@
 #define=YAML_DECLARE_STATIC
 
+# The following options are used to build PyYAML Windows installer
+# for Python 3.0 on my PC:
+#include_dirs=../../../libyaml/tags/0.1.2/include
+#library_dirs=../../../libyaml/tags/0.1.2/win32/vs2008/output/release/lib
+#define=YAML_DECLARE_STATIC

pyyaml/trunk/tests/lib/test_input_output.py

@@ -5 +5 @@
 def _unicode_open(file, encoding, errors='strict'):
     info = codecs.lookup(encoding)
-    srw = codecs.StreamReaderWriter(file, info.streamreader, info.streamwriter, errors)
+    if isinstance(info, tuple):
+        reader = info[2]
+        writer = info[3]
+    else:
+        reader = info.streamreader
+        writer = info.streamwriter
+    srw = codecs.StreamReaderWriter(file, reader, writer, errors)
     srw.encoding = encoding
     return srw