diff options
Diffstat (limited to 'libbe')
| -rw-r--r-- | libbe/bug.py | 6 | ||||
| -rw-r--r-- | libbe/mapfile.py | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libbe/bug.py b/libbe/bug.py index 46f244f..2cd05e3 100644 --- a/libbe/bug.py +++ b/libbe/bug.py @@ -65,10 +65,6 @@ def load_severities(severity_def): global severity_values global severity_description global severity_index - if type(severity_def[0]) == dict: - # Convert {"name": "X", "description": "Y"} severities to ("X","Y"). - # The dict form is loaded from the per-tree settings file. - severity_def = [(d["name"], d["description"]) for d in severity_def] severity_values = tuple([val for val,description in severity_def]) severity_description = dict(severity_def) severity_index = {} @@ -125,7 +121,7 @@ class Bug(settings_object.SavedSettingsObject): @_versioned_property(name="severity", doc="A measure of the bug's importance", default="minor", - allowed=severity_values, + check_fn=lambda s: s in severity_values, require_save=True) def severity(): return {} diff --git a/libbe/mapfile.py b/libbe/mapfile.py index a84cca3..f53f72c 100644 --- a/libbe/mapfile.py +++ b/libbe/mapfile.py @@ -34,6 +34,10 @@ def generate(map): """Generate a YAML mapfile content string. >>> generate({"q":"p"}) 'q: p\\n\\n' + >>> generate({"q":u"Fran\u00e7ais"}) + 'q: Fran\\xc3\\xa7ais\\n\\n' + >>> generate({"q":u"hello"}) + 'q: hello\\n\\n' >>> generate({"q=":"p"}) Traceback (most recent call last): IllegalKey: Illegal key "q=" @@ -69,7 +73,9 @@ def generate(map): lines = [] for key in keys: - lines.append(yaml.dump({key: map[key]}, default_flow_style=False)) + lines.append(yaml.safe_dump({key: map[key]}, + default_flow_style=False, + allow_unicode=True)) lines.append("") return '\n'.join(lines) |