Cleanup code: remove int/long idioms and simplify a while statement.

This commit is contained in:
Florent Xicluna 2011-10-23 22:11:00 +02:00
parent 8d48b43ea9
commit 2bb96f593a
5 changed files with 10 additions and 35 deletions

View file

@ -175,10 +175,8 @@ class FTP:
# Internal: "sanitize" a string for printing
def sanitize(self, s):
if s[:5] == 'pass ' or s[:5] == 'PASS ':
i = len(s)
while i > 5 and s[i-1] in {'\r', '\n'}:
i = i-1
if s[:5] in {'pass ', 'PASS '}:
i = len(s.rstrip('\r\n'))
s = s[:5] + '*'*(i-5) + s[i:]
return repr(s)
@ -596,10 +594,7 @@ class FTP:
resp = self.sendcmd('SIZE ' + filename)
if resp[:3] == '213':
s = resp[3:].strip()
try:
return int(s)
except (OverflowError, ValueError):
return int(s)
return int(s)
def mkd(self, dirname):
'''Make a directory, return its full pathname.'''
@ -861,11 +856,7 @@ def parse150(resp):
m = _150_re.match(resp)
if not m:
return None
s = m.group(1)
try:
return int(s)
except (OverflowError, ValueError):
return int(s)
return int(m.group(1))
_227_re = None