Index: pyyaml/trunk/lib3/yaml/cyaml.py
===================================================================
--- pyyaml/trunk/lib/yaml/cyaml.py	(revision 223)
+++ pyyaml/trunk/lib3/yaml/cyaml.py	(revision 331)
@@ -5,10 +5,10 @@
 from _yaml import CParser, CEmitter
 
-from constructor import *
+from .constructor import *
 
-from serializer import *
-from representer import *
+from .serializer import *
+from .representer import *
 
-from resolver import *
+from .resolver import *
 
 class CBaseLoader(CParser, BaseConstructor, BaseResolver):
@@ -42,5 +42,5 @@
             version=None, tags=None):
         CEmitter.__init__(self, stream, canonical=canonical,
-                indent=indent, width=width,
+                indent=indent, width=width, encoding=encoding,
                 allow_unicode=allow_unicode, line_break=line_break,
                 explicit_start=explicit_start, explicit_end=explicit_end,
@@ -59,5 +59,5 @@
             version=None, tags=None):
         CEmitter.__init__(self, stream, canonical=canonical,
-                indent=indent, width=width,
+                indent=indent, width=width, encoding=encoding,
                 allow_unicode=allow_unicode, line_break=line_break,
                 explicit_start=explicit_start, explicit_end=explicit_end,
@@ -76,5 +76,5 @@
             version=None, tags=None):
         CEmitter.__init__(self, stream, canonical=canonical,
-                indent=indent, width=width,
+                indent=indent, width=width, encoding=encoding,
                 allow_unicode=allow_unicode, line_break=line_break,
                 explicit_start=explicit_start, explicit_end=explicit_end,