Changeset 152
- Timestamp:
- 05/04/06 06:46:11 (2 years ago)
- Files:
-
- pyyaml/trunk/lib/yaml/__init__.py (modified) (2 diffs)
- pyyaml/trunk/lib/yaml/dumper.py (modified) (6 diffs)
- pyyaml/trunk/lib/yaml/representer.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pyyaml/trunk/lib/yaml/__init__.py
r147 r152 135 135 136 136 def dump_all(documents, stream=None, Dumper=Dumper, 137 default_style=None, default_flow_style=None, 137 138 canonical=None, indent=None, width=None, 138 139 allow_unicode=None, line_break=None, … … 151 152 stream = StringIO() 152 153 getvalue = stream.getvalue 153 dumper = Dumper(stream, canonical=canonical, indent=indent, width=width, 154 dumper = Dumper(stream, default_style=default_style, 155 default_flow_style=default_flow_style, 156 canonical=canonical, indent=indent, width=width, 154 157 allow_unicode=allow_unicode, line_break=line_break, 155 158 encoding=encoding, version=version, tags=tags, pyyaml/trunk/lib/yaml/dumper.py
r137 r152 10 10 11 11 def __init__(self, stream, 12 default_style=None, default_flow_style=None, 12 13 canonical=None, indent=None, width=None, 13 14 allow_unicode=None, line_break=None, … … 20 21 explicit_start=explicit_start, explicit_end=explicit_end, 21 22 version=version, tags=tags) 22 Representer.__init__(self) 23 Representer.__init__(self, default_style=default_style, 24 default_flow_style=default_flow_style) 23 25 Resolver.__init__(self) 24 26 … … 26 28 27 29 def __init__(self, stream, 30 default_style=None, default_flow_style=None, 28 31 canonical=None, indent=None, width=None, 29 32 allow_unicode=None, line_break=None, … … 36 39 explicit_start=explicit_start, explicit_end=explicit_end, 37 40 version=version, tags=tags) 38 SafeRepresenter.__init__(self) 41 SafeRepresenter.__init__(self, default_style=default_style, 42 default_flow_style=default_flow_style) 39 43 Resolver.__init__(self) 40 44 … … 42 46 43 47 def __init__(self, stream, 48 default_style=None, default_flow_style=None, 44 49 canonical=None, indent=None, width=None, 45 50 allow_unicode=None, line_break=None, … … 52 57 explicit_start=explicit_start, explicit_end=explicit_end, 53 58 version=version, tags=tags) 54 Representer.__init__(self) 59 Representer.__init__(self, default_style=default_style, 60 default_flow_style=default_flow_style) 55 61 Resolver.__init__(self) 56 62 pyyaml/trunk/lib/yaml/representer.py
r151 r152 27 27 yaml_multi_representers = {} 28 28 29 def __init__(self): 29 def __init__(self, default_style=None, default_flow_style=None): 30 self.default_style = default_style 31 self.default_flow_style = default_flow_style 30 32 self.represented_objects = {} 31 33 … … 97 99 98 100 def represent_scalar(self, tag, value, style=None): 101 if style is None: 102 style = self.default_style 99 103 return ScalarNode(tag, value, style=style) 100 104 … … 107 111 best_style = False 108 112 value.append(self.represent_data(item)) 113 if flow_style is None: 114 flow_style = self.default_flow_style 109 115 if flow_style is None: 110 116 flow_style = best_style … … 134 140 best_style = False 135 141 value.append((node_key, node_value)) 142 if flow_style is None: 143 flow_style = self.default_flow_style 136 144 if flow_style is None: 137 145 flow_style = best_style
