commit 533366beb007c1b9d917f9abaee4dd7db6ff3c4e
author Piers Lauder <piers@cs.su.oz.au> Tue Apr 29 23:58:08 2003 +0000
committer Piers Lauder <piers@cs.su.oz.au> Tue Apr 29 23:58:08 2003 +0000
tree 8eee2cc579e12109a0ba2ea7b477fcf2cc143431
parent 47404fffff3e36699786082d0ee6565872d627e1

improved CRLF regex for previous fix

Lib/imaplib.py

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 9f82e2b..6a68861 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -83,7 +83,7 @@
         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>.*))?')