aboutsummaryrefslogtreecommitdiffstats
path: root/becommands
diff options
context:
space:
mode:
authorGianluca Montecchi <gian@grys.it>2009-10-21 01:18:40 +0200
committerGianluca Montecchi <gian@grys.it>2009-10-21 01:18:40 +0200
commit85ab0b48299435a5ecfa6f93af95948d432e096a (patch)
tree6346eb2fe91dea868c6cf934130eafababbb2f60 /becommands
parente6dd43d2542aa3f67ebba61dd77942fb0a48a1f2 (diff)
downloadbugseverywhere-85ab0b48299435a5ecfa6f93af95948d432e096a.tar.gz
Finished merge with Trevor branch
Diffstat (limited to 'becommands')
-rw-r--r--becommands/comment.py4
-rw-r--r--becommands/html.py6
2 files changed, 2 insertions, 8 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,