summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorPiers Lauder <piers@cs.su.oz.au>2003-04-29 23:58:08 (GMT)
committerPiers Lauder <piers@cs.su.oz.au>2003-04-29 23:58:08 (GMT)
commit533366beb007c1b9d917f9abaee4dd7db6ff3c4e (patch)
tree8eee2cc579e12109a0ba2ea7b477fcf2cc143431 /Lib
parent47404fffff3e36699786082d0ee6565872d627e1 (diff)
downloadcpython-533366beb007c1b9d917f9abaee4dd7db6ff3c4e.zip
cpython-533366beb007c1b9d917f9abaee4dd7db6ff3c4e.tar.gz
cpython-533366beb007c1b9d917f9abaee4dd7db6ff3c4e.tar.bz2
improved CRLF regex for previous fix
Diffstat (limited to 'Lib')
-rw-r--r--Lib/imaplib.py2
1 files changed, 1 insertions, 1 deletions
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 @@ 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>.*))?')