diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2008-08-19 17:56:33 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2008-08-19 17:56:33 (GMT) |
| commit | fd036451bf0e0ade8783e21df801abf7be96d020 (patch) | |
| tree | e70ff65a9e641d8e790bc091f0dc2507baf344ca /Lib/ftplib.py | |
| parent | 3ad7ba10a20827b24d4b1aa9dd49474db8affbdd (diff) | |
| download | cpython-fd036451bf0e0ade8783e21df801abf7be96d020.zip cpython-fd036451bf0e0ade8783e21df801abf7be96d020.tar.gz cpython-fd036451bf0e0ade8783e21df801abf7be96d020.tar.bz2 | |
#2834: Change re module semantics, so that str and bytes mixing is forbidden,
and str (unicode) patterns get full unicode matching by default. The re.ASCII
flag is also introduced to ask for ASCII matching instead.
Diffstat (limited to 'Lib/ftplib.py')
| -rw-r--r-- | Lib/ftplib.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 4955727..b64e45e 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -590,7 +590,8 @@ def parse150(resp): global _150_re if _150_re is None: import re - _150_re = re.compile("150 .* \((\d+) bytes\)", re.IGNORECASE) + _150_re = re.compile( + "150 .* \((\d+) bytes\)", re.IGNORECASE | re.ASCII) m = _150_re.match(resp) if not m: return None @@ -613,7 +614,7 @@ def parse227(resp): global _227_re if _227_re is None: import re - _227_re = re.compile(r'(\d+),(\d+),(\d+),(\d+),(\d+),(\d+)') + _227_re = re.compile(r'(\d+),(\d+),(\d+),(\d+),(\d+),(\d+)', re.ASCII) m = _227_re.search(resp) if not m: raise error_proto(resp) |