mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 05:35:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use string methods where possible, and remove import string

Browse source
This commit is contained in:
Neal Norwitz 2002-05-31 14:13:04 +00:00
parent 05ab2e693c
commit 7ce734cd72
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/ftplib.py
View file

@ -36,7 +36,6 @@ python ftplib.py -d localhost -l -p -l
import os
import sys
import string
# Import SOCKS module if it exists, else standard socket module socket
try:
@ -266,7 +265,7 @@ class FTP:
if af == 0:
raise error_proto, 'unsupported address family'
fields = ['', `af`, host, `port`, '']
cmd = 'EPRT ' + string.joinfields(fields, '|')
cmd = 'EPRT ' + '|'.join(fields)
return self.voidcmd(cmd)
def makeport(self):
@ -585,18 +584,18 @@ def parse229(resp, peer):
if resp[:3] <> '229':
raise error_reply, resp
left = string.find(resp, '(')
left = resp.find('(')
if left < 0: raise error_proto, resp
right = string.find(resp, ')', left + 1)
right = resp.find(')', left + 1)
if right < 0:
raise error_proto, resp # should contain '(|||port|)'
if resp[left + 1] <> resp[right - 1]:
raise error_proto, resp
parts = string.split(resp[left + 1:right], resp[left+1])
parts = resp[left+1].split(resp[left + 1:right])
if len(parts) <> 5:
raise error_proto, resp
host = peer[0]
port = string.atoi(parts[3])
port = int(parts[3])
return host, port