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

* calendar.py: minor cleanups

Browse source 
* ftplib.py: support __init__ with optional host, port args
* aifc.py: ensure header is written on close even when no data is written
This commit is contained in:
Guido van Rossum 1993-06-17 12:38:10 +00:00
parent 234f942aef
commit 52fc1f607e
3 changed files with 49 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Lib/ftplib.py
View file

@ -68,16 +68,31 @@ PORT_CYCLE = 1000
# The class itself
class FTP:
# Initialize an instance. Arguments:
# - host: hostname to connect to
# - port: port to connect to (default the standard FTP port)
def init(self, host, *args):
if len(args) > 1: raise TypeError, 'too many args'
if args: port = args[0]
else: port = FTP_PORT
self.host = host
self.port = port
# New initialization method (called by class instantiation)
# Initialize host to localhost, port to standard ftp port
def __init__(self, *args):
# Initialize the instance to something mostly harmless
self.debugging = 0
self.host = ''
self.port = FTP_PORT
self.sock = None
self.file = None
self.welcome = None
if args:
apply(self.connect, args)
# Old init method (explicitly called by caller)
def init(self, *args):
if args:
apply(self.connect, args)
# Connect to host. Arguments:
# - host: hostname to connect to (default previous host)
# - port: port to connect to (default previous port)
def init(self, *args):
if args: self.host = args[0]
if args[1:]: self.port = args[1]
if args[2:]: raise TypeError, 'too many args'
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect(self.host, self.port)
self.file = self.sock.makefile('r')