SF.net SVN: tmda: [2089] trunk/tmda
[email protected] Sat, 07 Oct 2006 20:41:16 -0700
| Newsgroups | gmane.mail.spam.tmda.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2089
http://svn.sourceforge.net/tmda/?rev=2089&view=rev
Author: jasonrm
Date: 2006-10-07 20:41:07 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
All modules have been renamed according to PEP 8 standards. For example, the version 3 module
email.Message was renamed to email.message in version 4.
A new subpackage email.mime was added and all the version 3 email.MIME* modules were renamed and
situated into the email.mime subpackage. For example, the version 3 module email.MIMEText was renamed
to email.mime.text.
Note that the version 3 names will continue to work until Python 2.6, but we change them now anyway.
Modified Paths:
--------------
trunk/tmda/TMDA/Address.py
trunk/tmda/TMDA/AutoResponse.py
trunk/tmda/TMDA/Deliver.py
trunk/tmda/TMDA/MessageLogger.py
trunk/tmda/TMDA/Pending.py
trunk/tmda/TMDA/Queue/MaildirQueue.py
trunk/tmda/TMDA/Queue/OriginalQueue.py
trunk/tmda/TMDA/Queue/Queue.py
trunk/tmda/TMDA/Util.py
trunk/tmda/bin/tmda-inject
trunk/tmda/bin/tmda-ofmipd
trunk/tmda/bin/tmda-rfilter
Modified: trunk/tmda/TMDA/Address.py
===================================================================
--- trunk/tmda/TMDA/Address.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/Address.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -230,7 +230,7 @@
if tag:
pass
elif address:
- address = email.Utils.parseaddr(address)[1]
+ address = email.utils.parseaddr(address)[1]
(local_parts, dummy, dummy) = _split(address)
else:
return Address(address)
Modified: trunk/tmda/TMDA/AutoResponse.py
===================================================================
--- trunk/tmda/TMDA/AutoResponse.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/AutoResponse.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -23,13 +23,13 @@
from email import message_from_string
-from email.Charset import add_alias
-from email.Errors import MessageError
-from email.Header import Header, decode_header
-from email.MIMEMessage import MIMEMessage
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEText import MIMEText
-from email.Utils import formataddr, parseaddr
+from email.charset import add_alias
+from email.errors import MessageError
+from email.header import Header, decode_header
+from email.mime.message import MIMEMessage
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.utils import formataddr, parseaddr
import os
import time
@@ -57,7 +57,7 @@
class AutoResponse:
def __init__(self, msgin, bouncetext, response_type, recipient):
"""
- msgin is an email.Message object representing the incoming
+ msgin is an email.message object representing the incoming
message we are responding to.
bouncetext is a string of rfc822 headers/body created from a
Modified: trunk/tmda/TMDA/Deliver.py
===================================================================
--- trunk/tmda/TMDA/Deliver.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/Deliver.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -54,7 +54,7 @@
class Deliver:
def __init__(self, msg, delivery_option):
"""
- msg is an email.Message object.
+ msg is an email.message object.
deliver_option is a delivery action option string returned
from the TMDA.FilterParser instance.
Modified: trunk/tmda/TMDA/MessageLogger.py
===================================================================
--- trunk/tmda/TMDA/MessageLogger.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/MessageLogger.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -24,7 +24,7 @@
"""
-from email.Utils import parseaddr
+from email.utils import parseaddr
import Util
@@ -34,7 +34,7 @@
"""
logfile is the full path to the logfile.
- msg in an email.Message object.
+ msg in an email.message object.
vardict is a dictionary containing an indefinite number of
keyword arguments.
Modified: trunk/tmda/TMDA/Pending.py
===================================================================
--- trunk/tmda/TMDA/Pending.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/Pending.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -24,7 +24,7 @@
"""Pending messages functions."""
-from email.Utils import parseaddr
+from email.utils import parseaddr
import email
import os
import sys
Modified: trunk/tmda/TMDA/Queue/MaildirQueue.py
===================================================================
--- trunk/tmda/TMDA/Queue/MaildirQueue.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/Queue/MaildirQueue.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -25,7 +25,7 @@
"""
-from email.Utils import parseaddr
+from email.utils import parseaddr
from glob import glob
Modified: trunk/tmda/TMDA/Queue/OriginalQueue.py
===================================================================
--- trunk/tmda/TMDA/Queue/OriginalQueue.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/Queue/OriginalQueue.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -32,7 +32,7 @@
"""
-from email.Utils import parseaddr
+from email.utils import parseaddr
import glob
import os
Modified: trunk/tmda/TMDA/Queue/Queue.py
===================================================================
--- trunk/tmda/TMDA/Queue/Queue.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/Queue/Queue.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -80,7 +80,7 @@
"""
Insert the contents of a message into the queue.
- msg is an email.Message like object.
+ msg is an email.message like object.
mailid (see above)
@@ -92,9 +92,9 @@
def fetch_message(self, mailid, fullParse=False):
"""
Fetch the contents of a message in the queue. Should
- return an email.Message like object.
- Normally uses 'email.HeaderParser' for a quick parse unless 'fullParse'
- is set to True, in which case it uses the full 'email.Parser'.
+ return an email.message like object.
+ Normally uses HeaderParser' for a quick parse unless 'fullParse'
+ is set to True, in which case it uses the full 'email.parser'.
"""
pass
Modified: trunk/tmda/TMDA/Util.py
===================================================================
--- trunk/tmda/TMDA/Util.py 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/TMDA/Util.py 2006-10-08 03:41:07 UTC (rev 2089)
@@ -25,7 +25,7 @@
from cStringIO import StringIO
import cPickle
import email
-import email.Utils
+import email.utils
import fileinput
import fnmatch
import os
@@ -312,7 +312,7 @@
"""
if timesecs is None:
timesecs = time.time()
- return email.Utils.formatdate(timesecs, localtime=True)
+ return email.utils.formatdate(timesecs, localtime=True)
def file_to_dict(file, dict):
@@ -525,12 +525,12 @@
to parse the message body, instead setting the payload to the raw
body as a string. This is faster, and also helps us avoid
problems trying to parse spam with broken MIME bodies."""
- from email.Message import Message
+ from email.message import Message
if fullParse:
- from email.Parser import Parser
+ from email.parser import Parser
msg = Parser(Message).parse(fp)
else:
- from email.Parser import HeaderParser
+ from email.parser import HeaderParser
msg = HeaderParser(Message).parse(fp)
#msg.header_parsed = True
return msg
@@ -542,7 +542,7 @@
not wrapped, From is not escaped, and a leading From_ line is not
added.
- msg is an email.Message.Message object.
+ msg is an email.message.Message object.
maxheaderlen specifies the longest length for a non-continued
header. Disabled by default. RFC 2822 recommends 78.
@@ -553,13 +553,13 @@
unixfrom forces the printing of the envelope header delimiter.
Default is False."""
- from email import Generator
+ from email import generator
fp = StringIO()
#if hasattr(msg, 'header_parsed') and msg.header_parsed:
# genclass = Generator.HeaderParsedGenerator
#else:
#genclass = Generator.Generator
- genclass = Generator.Generator
+ genclass = generator.Generator
g = genclass(fp, mangle_from_=mangle_from_, maxheaderlen=maxheaderlen)
g.flatten(msg, unixfrom=unixfrom)
return fp.getvalue()
@@ -618,20 +618,20 @@
"""Accept a possibly encoded message header as a string, and
return a decoded string if it can be decoded.
- JRM: email.Header has a decode_header method, but it returns a
+ JRM: email.header has a decode_header method, but it returns a
list of decoded pairs, one for each part of the header, which is
an awkward interface IMO, especially when the header contains a
mix of encoded and non-encoded parts.
"""
try:
- from email import Header
+ from email import header
parts = []
- pairs = Header.decode_header(str)
+ pairs = header.decode_header(str)
for pair in pairs:
parts.append(pair[0])
decoded_string = ' '.join(parts)
return decoded_string
- except email.Errors.HeaderParseError:
+ except email.errors.HeaderParseError:
return str
@@ -655,7 +655,7 @@
try:
hdrstr = '\n'.join(['%s: %s' %
(k, decode_header(v)) for k, v in msg.items()])
- except email.Errors.HeaderParseError:
+ except email.errors.HeaderParseError:
hdrstr = headers_as_raw_string(msg)
return hdrstr
@@ -671,7 +671,7 @@
def rename_headers(msg, old, new):
"""Rename all occurances of a message header in a Message object.
- msg is an email.Message.Message object.
+ msg is an email.message.Message object.
old is name of the header to rename.
@@ -687,7 +687,7 @@
def add_headers(msg, headers):
"""Add headers to a Message object.
- msg is an email.Message.Message object.
+ msg is an email.message.Message object.
headers is a dictionary of headers and values.
"""
@@ -702,7 +702,7 @@
def purge_headers(msg, headers):
"""Purge headers from a Message object.
- msg is an email.Message.Message object.
+ msg is an email.message.Message object.
headers is a list of headers.
"""
Modified: trunk/tmda/bin/tmda-inject
===================================================================
--- trunk/tmda/bin/tmda-inject 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/bin/tmda-inject 2006-10-08 03:41:07 UTC (rev 2089)
@@ -124,7 +124,7 @@
from TMDA import FilterParser
from TMDA import Util
-from email.Utils import formataddr, getaddresses, parseaddr
+from email.utils import formataddr, getaddresses, parseaddr
import socket
import string
Modified: trunk/tmda/bin/tmda-ofmipd
===================================================================
--- trunk/tmda/bin/tmda-ofmipd 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/bin/tmda-ofmipd 2006-10-08 03:41:07 UTC (rev 2089)
@@ -378,7 +378,6 @@
import asynchat
import asyncore
import base64
-import email.Utils
import hmac
import imaplib
import md5
Modified: trunk/tmda/bin/tmda-rfilter
===================================================================
--- trunk/tmda/bin/tmda-rfilter 2006-10-08 03:14:41 UTC (rev 2088)
+++ trunk/tmda/bin/tmda-rfilter 2006-10-08 03:41:07 UTC (rev 2089)
@@ -206,7 +206,7 @@
from TMDA.Queue.Queue import Queue
from cStringIO import StringIO
-from email.Utils import parseaddr, getaddresses
+from email.utils import parseaddr, getaddresses
import email
import fileinput
import string
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.