diff options
Diffstat (limited to 'libbe')
-rw-r--r-- | libbe/command/html.py | 6 | ||||
-rw-r--r-- | libbe/command/target.py | 2 | ||||
-rw-r--r-- | libbe/ui/command_line.py | 2 | ||||
-rw-r--r-- | libbe/util/subproc.py | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/libbe/command/html.py b/libbe/command/html.py index 2b7dcf8..5186417 100644 --- a/libbe/command/html.py +++ b/libbe/command/html.py @@ -698,6 +698,7 @@ div.root.comment { {% if comments %} {% for depth,comment in comments %} +{{ div_close(depth) }} {% if depth == 0 %} <div class="comment root" id="C{{ comment_dir(comment) }}"> {% else %} @@ -707,11 +708,8 @@ div.root.comment { 'depth':depth, 'bug': bug, 'comment':comment, 'comment_dir':comment_dir, 'format_body': format_body, 'div_close': div_close, 'strip_email': strip_email}) }} -{{ div_close(depth) }} {% endfor %} -{% if comments[-1][0] > 0 %} {{ div_close(0) }} -{% endif %} {% else %} <p>No comments.</p> {% endif %} @@ -953,7 +951,7 @@ Html = HTML # alias for libbe.command.base.get_command_class() class _DivCloser (object): - def __init__(self, depth=0): + def __init__(self, depth=-1): self.depth = depth def __call__(self, depth): diff --git a/libbe/command/target.py b/libbe/command/target.py index 6cf9cc6..20ffb57 100644 --- a/libbe/command/target.py +++ b/libbe/command/target.py @@ -109,7 +109,7 @@ class Target (libbe.command.Command): if bug == None: print >> self.stdout, 'No target assigned.' else: - print >> self.stdout, bug.uuid + print >> self.stdout, bug.id.long_user() return 0 bugdir,bug,comment = ( libbe.command.util.bugdir_bug_comment_from_user_id( diff --git a/libbe/ui/command_line.py b/libbe/ui/command_line.py index d94da80..614366d 100644 --- a/libbe/ui/command_line.py +++ b/libbe/ui/command_line.py @@ -23,6 +23,7 @@ A command line interface to Bugs Everywhere. import optparse import os import sys +import locale import libbe import libbe.bugdir @@ -340,6 +341,7 @@ def dispatch(ui, command, args): return ret def main(): + locale.setlocale(locale.LC_ALL, '') io = libbe.command.StdInputOutput() ui = CommandLine(io) be = BE(ui=ui) diff --git a/libbe/util/subproc.py b/libbe/util/subproc.py index f1f04c1..0ad010c 100644 --- a/libbe/util/subproc.py +++ b/libbe/util/subproc.py @@ -87,7 +87,9 @@ def invoke(args, stdin=None, stdout=PIPE, stderr=PIPE, expect=(0,), stdout = unicode(stdout, encoding) if stderr != None: stderr = unicode(stderr, encoding) - libbe.LOG.debug('{0}\n{1}{2}'.format(status, stdout, stderr)) + libbe.LOG.debug(u'{0}\n{1}{2}'.format(status, stdout, stderr)) + else: + libbe.LOG.debug('{0}\n{1}{2}'.format(status, stdout, stderr)) if status not in expect: raise CommandError(list_args, status, stdout, stderr) return status, stdout, stderr |