Commit acfb82a5 authored by Guido van Rossum's avatar Guido van Rossum

Use re instead of regex. Also remove bogus return statement from __init__().

parent 8566e474
...@@ -105,7 +105,6 @@ class FTP: ...@@ -105,7 +105,6 @@ class FTP:
if host: if host:
resp = self.connect(host) resp = self.connect(host)
if user: resp = self.login(user, passwd, acct) if user: resp = self.login(user, passwd, acct)
return resp
def connect(self, host = '', port = 0): def connect(self, host = '', port = 0):
'''Connect to host. Arguments are: '''Connect to host. Arguments are:
...@@ -469,8 +468,7 @@ class FTP: ...@@ -469,8 +468,7 @@ class FTP:
del self.file, self.sock del self.file, self.sock
import regex _150_re = None
_150_re = regex.compile("150 .* (\([0-9][0-9]*\) bytes)", regex.casefold)
def parse150(resp): def parse150(resp):
'''Parse the '150' response for a RETR request. '''Parse the '150' response for a RETR request.
...@@ -479,9 +477,13 @@ def parse150(resp): ...@@ -479,9 +477,13 @@ def parse150(resp):
''' '''
if resp[:3] != '150': if resp[:3] != '150':
raise error_reply, resp raise error_reply, resp
length = _150_re.match(resp) global _150_re
if length >= 0: if _150_re is None:
return string.atoi(_150_re.group(1)) import re
_150_re = re.compile("150 .* \(([0-9][0-9]*) bytes\)", re.IGNORECASE)
m = _150_re.match(resp)
if m:
return string.atoi(m.group(1))
return None return None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment