From ced2acc6cf47602b0bf2e51e09c5c68b2198eae9 Mon Sep 17 00:00:00 2001 From: jgoerzen Date: Fri, 18 Apr 2003 05:18:54 +0100 Subject: [PATCH] /offlineimap/head: changeset 444 Fixed line-ending code to deal with files with mixed \n and \r\n codes. This is a rare case, but now is more onerous because we now have to find headers. --- offlineimap/head/debian/changelog | 9 +++++++++ offlineimap/head/offlineimap/folder/IMAP.py | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog index 1981f0d..34ab3d2 100644 --- a/offlineimap/head/debian/changelog +++ b/offlineimap/head/debian/changelog @@ -1,3 +1,12 @@ +offlineimap (3.99.13) unstable; urgency=low + + * Fixed password prompting for non-Curses UIs. + * Fixed line-ending code to deal with files with mixed \n and \r\n + codes. This is a rare case, but now is more onerous because we now + have to find headers. + + -- John Goerzen Thu, 17 Apr 2003 18:02:13 -0500 + offlineimap (3.99.12) unstable; urgency=low * This is a 4.0 TRACK release, and may be unstable or in flux! diff --git a/offlineimap/head/offlineimap/folder/IMAP.py b/offlineimap/head/offlineimap/folder/IMAP.py index 6e04380..34b4508 100644 --- a/offlineimap/head/offlineimap/folder/IMAP.py +++ b/offlineimap/head/offlineimap/folder/IMAP.py @@ -174,8 +174,7 @@ class IMAPFolder(BaseFolder): # but some IMAP servers nonetheless choke on 1902. date = imaplib.Time2Internaldate(time.localtime()) - if content.find("\r\n") == -1: # Convert line endings if not already - content = content.replace("\n", "\r\n") + content = re.sub("[^\r]\n", "\r\n", content) (headername, headervalue) = self.savemessage_getnewheader(content) content = self.savemessage_addheader(content, headername, -- 2.39.2