diff options
| author | W. Trevor King <wking@drexel.edu> | 2012-03-03 11:22:08 -0500 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2012-03-03 11:22:08 -0500 |
| commit | 9425f381b58d878194e7d19629192ecb6bd948c8 (patch) | |
| tree | 21fb3f985d65c0037f794a098b04033ec6f81690 | |
| parent | 2ba27b00384c55ec7fe29e09ce2d2c3e8eeb0977 (diff) | |
| download | bugseverywhere-9425f381b58d878194e7d19629192ecb6bd948c8.tar.gz | |
Apply Niall's earlier fix for comment XML loading to bug XML loading.
Sometimes saxutils returns unicode.
| -rw-r--r-- | libbe/bug.py | 4 | ||||
| -rw-r--r-- | libbe/comment.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libbe/bug.py b/libbe/bug.py index f562836..7cf1bf8 100644 --- a/libbe/bug.py +++ b/libbe/bug.py @@ -405,7 +405,9 @@ class Bug (settings_object.SavedSettingsObject): text = settings_object.EMPTY else: text = xml.sax.saxutils.unescape(child.text) - text = text.decode('unicode_escape').strip() + if not isinstance(text, unicode): + text = text.decode('unicode_escape') + text = text.strip() if child.tag == 'uuid' and not preserve_uuids: uuid = text continue # don't set the bug's uuid tag. diff --git a/libbe/comment.py b/libbe/comment.py index cfb951d..392e692 100644 --- a/libbe/comment.py +++ b/libbe/comment.py @@ -377,7 +377,6 @@ class Comment (Tree, settings_object.SavedSettingsObject): text = settings_object.EMPTY else: text = xml.sax.saxutils.unescape(child.text) - # Sometimes saxutils returns unicode if not isinstance(text, unicode): text = text.decode('unicode_escape') text = text.strip() |