Merged with Trevor's -rr branch

1 files changed, 17 insertions, 17 deletions

diff --git a/becommands/comment.py b/becommands/comment.py
index 55b5913..9a614b2 100644
--- a/becommands/comment.py
+++ b/becommands/comment.py
@@ -25,20 +25,20 @@ except ImportError: # look for non-core module
     from elementtree import ElementTree
 __desc__ = __doc__
 
-def execute(args, test=False):
+def execute(args, manipulate_encodings=True):
     """
     >>> import time
-    >>> bd = bugdir.simple_bug_dir()
+    >>> bd = bugdir.SimpleBugDir()
     >>> os.chdir(bd.root)
-    >>> execute(["a", "This is a comment about a"], test=True)
+    >>> execute(["a", "This is a comment about a"], manipulate_encodings=False)
     >>> bd._clear_bugs()
-    >>> bug = bd.bug_from_shortname("a")
+    >>> bug = cmdutil.bug_from_shortname(bd, "a")
     >>> bug.load_comments(load_full=False)
     >>> comment = bug.comment_root[0]
     >>> print comment.body
     This is a comment about a
     <BLANKLINE>
-    >>> comment.From == bd.user_id
+    >>> comment.author == bd.user_id
     True
     >>> comment.time <= int(time.time())
     True
@@ -47,19 +47,20 @@ def execute(args, test=False):
 
     >>> if 'EDITOR' in os.environ:
     ...     del os.environ["EDITOR"]
-    >>> execute(["b"], test=True)
+    >>> execute(["b"], manipulate_encodings=False)
     Traceback (most recent call last):
     UserError: No comment supplied, and EDITOR not specified.
 
     >>> os.environ["EDITOR"] = "echo 'I like cheese' > "
-    >>> execute(["b"], test=True)
+    >>> execute(["b"], manipulate_encodings=False)
     >>> bd._clear_bugs()
-    >>> bug = bd.bug_from_shortname("b")
+    >>> bug = cmdutil.bug_from_shortname(bd, "b")
     >>> bug.load_comments(load_full=False)
     >>> comment = bug.comment_root[0]
     >>> print comment.body
     I like cheese
     <BLANKLINE>
+    >>> bd.cleanup()
     """
     parser = get_parser()
     options, args = parser.parse_args(args)
@@ -68,10 +69,10 @@ def execute(args, test=False):
         raise cmdutil.UsageError("Please specify a bug or comment id.")
     if len(args) > 2:
         raise cmdutil.UsageError("Too many arguments.")
-    
+
     shortname = args[0]
     if shortname.count(':') > 1:
-        raise cmdutil.UserError("Invalid id '%s'." % shortname)        
+        raise cmdutil.UserError("Invalid id '%s'." % shortname)
     elif shortname.count(':') == 1:
         # Split shortname generated by Comment.comment_shortnames()
         bugname = shortname.split(':')[0]
@@ -79,17 +80,17 @@ def execute(args, test=False):
     else:
         bugname = shortname
         is_reply = False
-    
+
     bd = bugdir.BugDir(from_disk=True,
-                       manipulate_encodings=not test)
-    bug = bd.bug_from_shortname(bugname)
+                       manipulate_encodings=manipulate_encodings)
+    bug = cmdutil.bug_from_shortname(bd, bugname)
     bug.load_comments(load_full=False)
     if is_reply:
         parent = bug.comment_root.comment_from_shortname(shortname,
                                                          bug_shortname=bugname)
     else:
         parent = bug.comment_root
-    
+
     if len(args) == 1: # try to launch an editor for comment-body entry
         try:
             if parent == bug.comment_root:
@@ -103,7 +104,6 @@ def execute(args, test=False):
             raise cmdutil.UserError, "No comment supplied, and EDITOR not specified."
         if body is None:
             raise cmdutil.UserError("No comment entered.")
-        body = body.decode('utf-8')
     elif args[1] == '-': # read body from stdin
         binary = not (options.content_type == None
                       or options.content_type.startswith("text/"))
@@ -117,11 +117,11 @@ def execute(args, test=False):
         body = args[1]
         if not body.endswith('\n'):
             body+='\n'
-    
+
     if options.XML == False:
         new = parent.new_reply(body=body)
         if options.author != None:
-            new.From = options.author
+            new.author = options.author
         if options.alt_id != None:
             new.alt_id = options.alt_id
         if options.content_type != None: