aboutsummaryrefslogtreecommitdiffstats
path: root/xml/be-xml-to-mbox
diff options
context:
space:
mode:
authorW. Trevor King <wking@drexel.edu>2009-06-22 14:30:42 -0400
committerW. Trevor King <wking@drexel.edu>2009-06-22 14:30:42 -0400
commit0f6e647f18a2d6165c0333cb7d123fc781c8e4e1 (patch)
tree4716c40c0e0a361431fcd33f734029a3175b71e4 /xml/be-xml-to-mbox
parent11556f64815eeba2bb9bea5fd804841152d836bd (diff)
downloadbugseverywhere-0f6e647f18a2d6165c0333cb7d123fc781c8e4e1.tar.gz
Use Comment.content_type in xml output.
Diffstat (limited to 'xml/be-xml-to-mbox')
-rwxr-xr-xxml/be-xml-to-mbox8
1 files changed, 6 insertions, 2 deletions
diff --git a/xml/be-xml-to-mbox b/xml/be-xml-to-mbox
index 0f430dc..7d07bac 100755
--- a/xml/be-xml-to-mbox
+++ b/xml/be-xml-to-mbox
@@ -28,6 +28,7 @@ followed by a blank line.
import email.utils
import types
+from libbe.encoding import get_encoding, set_IO_stream_encodings
from libbe.utility import str_to_time as rfc2822_to_gmtime_integer
from time import asctime, gmtime
from xml.sax import make_parser
@@ -37,6 +38,8 @@ from xml.sax.saxutils import unescape
DEFAULT_DOMAIN = "invalid.com"
DEFAULT_EMAIL = "dummy@" + DEFAULT_DOMAIN
+DEFAULT_ENCODING = get_encoding()
+set_IO_stream_encodings(DEFAULT_ENCODING)
def rfc2822_to_asctime(rfc2822_string):
"""Convert an RFC 2822-fomatted string into a asctime string.
@@ -85,7 +88,7 @@ class Bug (LimitedAttrDict):
print "Message-ID: <%s@%s>" % (self["uuid"], DEFAULT_DOMAIN)
print "Date: %s" % self["created"]
print "From: %s" % self["creator"]
- print "Content-Type: %s" % "text/plain; charset=utf-8"
+ print "Content-Type: %s; charset=%s" % ("text/plain", DEFAULT_ENCODING)
print "Content-Transfer-Encoding: 8bit"
print "Subject: %s: %s" % (self["short-name"], self["summary"])
print ""
@@ -100,6 +103,7 @@ class Comment (LimitedAttrDict):
u"in-reply-to",
u"from",
u"date",
+ u"content-type",
u"body"]
def print_to_mbox(self, bug):
name,addr = email.utils.parseaddr(self["from"])
@@ -107,7 +111,7 @@ class Comment (LimitedAttrDict):
print "Message-ID: <%s@%s>" % (self["uuid"], DEFAULT_DOMAIN)
print "Date: %s" % self["date"]
print "From: %s" % self["from"]
- print "Content-Type: %s" % "text/plain; charset=utf-8"
+ print "Content-Type: %s; charset=%s" % (self["content-type"], DEFAULT_ENCODING)
print "Content-Transfer-Encoding: 8bit"
print "Subject: %s: %s" % (self["short-name"], bug["summary"])
if "in-reply-to" not in self.keys():