1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

Update to 4.3.9.

PR:		81211
Submitted by:	Linh Pham (maintainer)
This commit is contained in:
Roman Bogorodskiy 2005-05-19 04:28:16 +00:00
parent 0fd7950e39
commit fa999c30c3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=135580
4 changed files with 34 additions and 62 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= getmail
PORTVERSION= 4.3.8
PORTVERSION= 4.3.9
CATEGORIES= mail python
MASTER_SITES= http://pyropus.ca/software/getmail/%SUBDIR%/
MASTER_SITE_SUBDIR= old-versions

View File

@ -1,2 +1,2 @@
MD5 (getmail-4.3.8.tar.gz) = c4a41924a95fa8efc78f87a6d2248d57
SIZE (getmail-4.3.8.tar.gz) = 133718
MD5 (getmail-4.3.9.tar.gz) = 3689bbe74d116a53a6ae0d66a31cbdf5
SIZE (getmail-4.3.9.tar.gz) = 134255

View File

@ -1,43 +1,19 @@
--- getmailcore/message.py.orig Mon Feb 21 15:57:08 2005
+++ getmailcore/message.py Mon Feb 21 16:04:17 2005
@@ -7,6 +7,7 @@
'Message',
]
+import sys
import os
import time
--- getmailcore/message.py.orig Wed May 18 09:28:26 2005
+++ getmailcore/message.py Wed May 18 10:41:19 2005
@@ -12,6 +12,7 @@
import cStringIO
@@ -86,20 +87,28 @@
# of filters, etc, which should be saner.
if fromlines:
try:
- self.__msg = email.message_from_string(os.linesep.join(
- fromlines), strict=False)
+ if sys.version_info < (2, 4):
+ self.__msg = email.message_from_string(os.linesep.join(fromlines), strict=False)
+ else:
+ self.__msg = email.message_from_string(os.linesep.join(fromlines))
except email.Errors.MessageError, o:
self.__msg = corrupt_message(o, fromlines=fromlines)
self.__raw = os.linesep.join(fromlines)
elif fromstring:
try:
- self.__msg = email.message_from_string(fromstring, strict=False)
+ if sys.version_info < (2, 4):
+ self.__msg = email.message_from_string(fromstring, strict=False)
+ else:
+ self.__msg = email.message_from_string(fromstring)
except email.Errors.MessageError, o:
self.__msg = corrupt_message(o, fromstring=fromstring)
self.__raw = fromstring
elif fromfile:
try:
- self.__msg = email.message_from_file(fromfile, strict=False)
+ if sys.version_info < (2, 4):
+ self.__msg = email.message_from_file(fromfile, strict=False)
+ else:
+ self.__msg = email.message_from_file(fromfile)
except email.Errors.MessageError, o:
# Shouldn't happen
self.__msg = corrupt_message(o, fromstring=fromfile.read())
import email
import email.Errors
+import email.Parser
import email.Utils
from email.Generator import Generator
@@ -79,7 +80,7 @@
self.received_from = None
self.received_with = None
self.__raw = None
- parser = email.Parser.HeaderParser(strict=False)
+ parser = email.Parser.HeaderParser()
# Message is instantiated with fromlines for POP3, fromstring for
# IMAP (both of which can be badly-corrupted or invalid, i.e. spam,

View File

@ -1,23 +1,19 @@
--- getmailcore/_retrieverbases.py.orig Mon Feb 21 15:57:08 2005
+++ getmailcore/_retrieverbases.py Mon Feb 21 15:59:11 2005
@@ -33,6 +33,7 @@
'RetrieverSkeleton',
]
+import sys
import os
import socket
--- getmailcore/_retrieverbases.py.orig Wed May 18 09:31:20 2005
+++ getmailcore/_retrieverbases.py Wed May 18 10:41:09 2005
@@ -38,6 +38,7 @@
import time
@@ -445,7 +446,11 @@
import getpass
import email
+import email.Parser
import poplib
import imaplib
import sets
@@ -445,7 +446,7 @@
self.log.trace()
msgnum = self._getmsgnumbyid(msgid)
response, headerlist, octets = self.conn.top(msgnum, 0)
- parser = email.Parser.Parser(strict=False)
+ # 'strict' argument is deprecated in Python 2.4
+ if sys.version_info < (2, 4):
+ parser = email.Parser.Parser(strict=False)
+ else:
+ parser = email.Parser.Parser()
return parser.parsestr(os.linesep.join(headerlist), headersonly=True)
- parser = email.Parser.HeaderParser(strict=False)
+ parser = email.Parser.HeaderParser()
return parser.parsestr(os.linesep.join(headerlist))
def initialize(self):