From: Piers Lauder <piers@cs.su.oz.au>
Date: Tue, 29 Apr 2003 23:58:08 +0000 (+0000)
Subject: improved CRLF regex for previous fix
X-Git-Tag: v2.3c1~924
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=533366beb007c1b9d917f9abaee4dd7db6ff3c4e;p=thirdparty%2FPython%2Fcpython.git

improved CRLF regex for previous fix
---

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 9f82e2b3a9cd..6a6886197c8f 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -83,7 +83,7 @@ InternalDate = re.compile(r'.*INTERNALDATE "'
         r' (?P<zonen>[-+])(?P<zoneh>[0-9][0-9])(?P<zonem>[0-9][0-9])'
         r'"')
 Literal = re.compile(r'.*{(?P<size>\d+)}$')
-MapCRLF = re.compile(r'(?:\r\n|\n|\r(?!\n))')
+MapCRLF = re.compile(r'\r\n|\r|\n')
 Response_code = re.compile(r'\[(?P<type>[A-Z-]+)( (?P<data>[^\]]*))?\]')
 Untagged_response = re.compile(r'\* (?P<type>[A-Z-]+)( (?P<data>.*))?')
 Untagged_status = re.compile(r'\* (?P<data>\d+) (?P<type>[A-Z-]+)( (?P<data2>.*))?')