Index: /pyyaml/trunk/lib/yaml/dumper.py
===================================================================
--- /pyyaml/trunk/lib/yaml/dumper.py	(revision 152)
+++ /pyyaml/trunk/lib/yaml/dumper.py	(revision 307)
@@ -17,5 +17,5 @@
         Emitter.__init__(self, stream, canonical=canonical,
                 indent=indent, width=width,
-                allow_uncode=allow_unicode, line_break=line_break)
+                allow_unicode=allow_unicode, line_break=line_break)
         Serializer.__init__(self, encoding=encoding,
                 explicit_start=explicit_start, explicit_end=explicit_end,
Index: /pyyaml/trunk/lib/yaml/emitter.py
===================================================================
--- /pyyaml/trunk/lib/yaml/emitter.py	(revision 304)
+++ /pyyaml/trunk/lib/yaml/emitter.py	(revision 307)
@@ -11,6 +11,4 @@
 from error import YAMLError
 from events import *
-
-import re
 
 class EmitterError(YAMLError):
@@ -1112,5 +1110,5 @@
                 data = data.encode(self.encoding)
             self.stream.write(data)
-        self.writespace = False
+        self.whitespace = False
         self.indention = False
         spaces = False
@@ -1125,5 +1123,5 @@
                     if start+1 == end and self.column > self.best_width and split:
                         self.write_indent()
-                        self.writespace = False
+                        self.whitespace = False
                         self.indention = False
                     else: