提交 b3df5697 编写于 作者: T Torsten Werner

don't convert changes file from utf-8 to ascii

Signed-off-by: NTorsten Werner <twerner@debian.org>
上级 2cafb984
......@@ -12,7 +12,6 @@ import cPickle
import re
import sys
import time
import encodings.ascii
from optparse import OptionParser
from datetime import datetime
......@@ -53,14 +52,6 @@ class Status:
self.queue = {}
def utf2ascii(src):
""" Return an ASCII encoded copy of the input UTF-8 string """
try:
res = unicode(src, 'utf-8').encode('ascii', 'replace')
except UnicodeDecodeError:
res = None
return res
def purge_old_items(feed, max):
""" Purge RSSItem from feed, no more than max. """
if feed.items is None or len(feed.items) == 0:
......@@ -144,8 +135,8 @@ def add_rss_item(status, msg, direction):
return False
description = "<pre>Description: %s\nChanges: %s\n</pre>" % \
(utf2ascii(cgi.escape(msg['Description'])),
utf2ascii(cgi.escape(msg['Changes'])))
(cgi.escape(msg['Description']),
cgi.escape(msg['Changes']))
link = "http://ftp-master.debian.org/new/%s_%s.html" % \
(msg['Source'], msg['Version'])
......@@ -155,7 +146,7 @@ def add_rss_item(status, msg, direction):
title,
pubDate = pubdate,
description = description,
author = utf2ascii(cgi.escape(msg['Maintainer'])),
author = cgi.escape(msg['Maintainer']),
link = link,
guid = link
)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册