Index: /pyyaml/trunk/setup.cfg
===================================================================
--- /pyyaml/trunk/setup.cfg	(revision 322)
+++ /pyyaml/trunk/setup.cfg	(revision 335)
@@ -34,2 +34,7 @@
 #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
Index: /pyyaml/trunk/ext/_yaml.h
===================================================================
--- /pyyaml/trunk/ext/_yaml.h	(revision 334)
+++ /pyyaml/trunk/ext/_yaml.h	(revision 335)
@@ -4,5 +4,5 @@
 #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
Index: /pyyaml/trunk/tests/lib/test_input_output.py
===================================================================
--- /pyyaml/trunk/tests/lib/test_input_output.py	(revision 334)
+++ /pyyaml/trunk/tests/lib/test_input_output.py	(revision 335)
@@ -5,5 +5,11 @@
 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