Skip to content

Commit d0a8f32

Browse files
committed
Remove FeedParser shim from anypy.email_
The FeedParser shim was being used to provide support for python v2.4, but Roundup no longer has support for python v2.4 so we can get rid of it.
1 parent ee85c54 commit d0a8f32

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

roundup/anypy/email_.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,6 @@ def _unifiedheaderinit(self, *args, **kw):
1717
email.Header.Header.__dict__['__init__'] = _unifiedheaderinit
1818
##
1919

20-
try:
21-
# Python 2.5+
22-
from email.parser import FeedParser
23-
except ImportError:
24-
# Python 2.4
25-
try :
26-
from email.Parser import FeedParser
27-
except ImportError:
28-
from email.Parser import Parser
29-
class FeedParser:
30-
def __init__(self):
31-
self.content = []
32-
33-
def feed(self, s):
34-
self.content.append(s)
35-
36-
def close(self):
37-
p = Parser()
38-
return p.parsestr(''.join(self.content))
39-
4020
# Match encoded-word strings in the form =?charset?q?Hello_World?=
4121
ecre = re.compile(r'''
4222
=\? # literal =?

roundup/roundupdb.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
import os.path
2626
import logging
2727
from email import Encoders
28+
from email.parser import FeedParser
2829
from email.Utils import formataddr
2930
from email.Header import Header
3031
from email.MIMEText import MIMEText
3132
from email.MIMEBase import MIMEBase
3233
from email.MIMEMultipart import MIMEMultipart
3334

34-
from anypy.email_ import FeedParser
35-
3635
from roundup import password, date, hyperdb
3736
from roundup.i18n import _
3837
from roundup.hyperdb import iter_roles

0 commit comments

Comments
 (0)