summaryrefslogtreecommitdiff
path: root/main.py
diff options
context:
space:
mode:
authorAnthon van der Neut <anthon@mnt.org>2017-07-25 08:07:39 +0200
committerAnthon van der Neut <anthon@mnt.org>2017-07-25 08:07:39 +0200
commite75accb09fcf8d796ea98b1e3d810a51bff6fa98 (patch)
treeb4cfbd6d65059f1d708c5c5fa0f47159259c7cf9 /main.py
parent001d27e2f2c404d2a71e940332bc58f4ab0c16f0 (diff)
downloadruamel.yaml-e75accb09fcf8d796ea98b1e3d810a51bff6fa98.tar.gz
fix https://stackoverflow.com/a/45281922/13079050.15.21
Diffstat (limited to 'main.py')
-rw-r--r--main.py17
1 files changed, 13 insertions, 4 deletions
diff --git a/main.py b/main.py
index 58b1c81..35bcdcf 100644
--- a/main.py
+++ b/main.py
@@ -94,7 +94,8 @@ class YAML(object):
self.Composer = ruamel.yaml.composer.Composer
self.Constructor = ruamel.yaml.constructor.BaseConstructor
elif self.typ == 'unsafe':
- self.Emitter = ruamel.yaml.emitter.Emitter
+ self.Emitter = ruamel.yaml.emitter.Emitter if pure or CEmitter is None \
+ else CEmitter
self.Representer = ruamel.yaml.representer.Representer
self.Parser = ruamel.yaml.parser.Parser if pure or CParser is None else CParser
self.Composer = ruamel.yaml.composer.Composer
@@ -118,7 +119,7 @@ class YAML(object):
self.version = None
self.preserve_quotes = None
self.allow_duplicate_keys = False # duplicate keys in map, set
- self.encoding = None
+ self.encoding = 'utf-8'
self.explicit_start = None
self.explicit_end = None
self.tags = None
@@ -382,7 +383,10 @@ class YAML(object):
delattr(self, "_serializer")
delattr(self, "_emitter")
if transform:
- fstream.write(transform(stream.getvalue())) # type: ignore
+ val = stream.getvalue()
+ if self.encoding:
+ val = val.decode(self.encoding)
+ fstream.write(transform(val)) # type: ignore
return None
def get_serializer_representer_emitter(self, stream, tlca):
@@ -425,7 +429,12 @@ class YAML(object):
default_flow_style=default_flow_style)
rslvr.__init__(selfx)
self._stream = stream
- dumper = XDumper(stream)
+ dumper = XDumper(stream, default_style=self.default_style,
+ default_flow_style=self.default_flow_style,
+ allow_unicode=self.allow_unicode, line_break=self.line_break,
+ explicit_start=self.explicit_start,
+ explicit_end=self.explicit_end,
+ version=self.version, tags=self.tags)
self._emitter = self._serializer = dumper
return dumper, dumper, dumper