diff options
| -rw-r--r-- | becommands/comment.py | 4 | ||||
| -rw-r--r-- | becommands/html.py | 6 | ||||
| -rw-r--r-- | libbe/comment.py | 4 | ||||
| -rw-r--r-- | libbe/vcs.py | 1 |
4 files changed, 5 insertions, 10 deletions
diff --git a/becommands/comment.py b/becommands/comment.py index 9a614b2..950a95a 100644 --- a/becommands/comment.py +++ b/becommands/comment.py @@ -119,13 +119,11 @@ def execute(args, manipulate_encodings=True): body+='\n' if options.XML == False: - new = parent.new_reply(body=body) + new = parent.new_reply(body=body, content_type=options.content_type) if options.author != None: new.author = options.author if options.alt_id != None: new.alt_id = options.alt_id - if options.content_type != None: - new.content_type = options.content_type else: # import XML comment [list] # read in the comments str_body = body.encode("unicode_escape").replace(r'\n', '\n') diff --git a/becommands/html.py b/becommands/html.py index 31b97a1..232aa80 100644 --- a/becommands/html.py +++ b/becommands/html.py @@ -104,7 +104,6 @@ class HTMLGen (object): self.verbose = verbose self.title = title self.index_header = index_header - if encoding != None: self.encoding = encoding else: @@ -118,13 +117,11 @@ class HTMLGen (object): if template != None: self._load_user_templates() - - def run(self, out_dir): if self.verbose == True: print "Creating the html output in %s using templates in %s" \ % (out_dir, self.template) - + bugs_active = [] bugs_inactive = [] bugs = [b for b in self.bd] @@ -281,7 +278,6 @@ class HTMLGen (object): filename = "index_inactive.html" else: raise Exception, "Unrecognized bug_type: '%s'" % bug_type - template_info = {'title':title, 'index_header':index_header, 'charset':self.encoding, diff --git a/libbe/comment.py b/libbe/comment.py index 41bc7e6..02bcc93 100644 --- a/libbe/comment.py +++ b/libbe/comment.py @@ -604,7 +604,7 @@ class Comment(Tree, settings_object.SavedSettingsObject): reply.in_reply_to = self.uuid self.append(reply) - def new_reply(self, body=None): + def new_reply(self, body=None, content_type=None): """ >>> comm = Comment(bug=None, body="Some insightful remarks") >>> repA = comm.new_reply("Critique original comment") @@ -613,6 +613,8 @@ class Comment(Tree, settings_object.SavedSettingsObject): True """ reply = Comment(self.bug, body=body) + if content_type != None: # set before saving body to decide binary format + reply.content_type = content_type if self.bug != None: reply.set_sync_with_disk(self.bug.sync_with_disk) if reply.sync_with_disk == True: diff --git a/libbe/vcs.py b/libbe/vcs.py index 7b506e8..7484660 100644 --- a/libbe/vcs.py +++ b/libbe/vcs.py @@ -840,7 +840,6 @@ class VCS_commit_TestCase(VCSTestCase): def test_revision_file_contents_as_committed(self): """Should get file contents as committed to specified revision.""" - import sys if not self.vcs.versioned: return for path in self.test_files: |