get_files = GetFiles()
try:
ftp.dir(get_files)
- except ftplib.all_errors, msg:
+ except ftplib.all_errors as msg:
tree.append((ftpscan_error_mark, "Cannot list directory `%s': %s" % (ftp_dir, msg)))
return
files = get_files.files()
full_path = ftp_dir + '/' + name
try:
ftp.cwd(name)
- except ftplib.error_perm, msg:
+ except ftplib.error_perm as msg:
tree.append((ftpscan_error_mark, "Cannot enter directory `%s': %s" % (full_path, msg)))
if isinstance(ftp, ReconnectingFTPWrapper):
ftp.cwd("..", False)
- except ftplib.all_errors, msg:
+ except ftplib.all_errors as msg:
tree.append((ftpscan_error_mark, "Cannot enter directory `%s': %s" % (full_path, msg)))
else:
_traverse_ftp(ftp, tree, full_path)
ftp = ReconnectingFTPWrapperClass(ftp, ftp_server, ftp_port, login, password, ftp_dir, tree)
ftp.connect(ftp_server, ftp_port)
ftp.login(login, password)
- if ftp_dir <> '/':
+ if ftp_dir != '/':
ftp.cwd(ftp_dir)
_traverse_ftp(ftp, tree, ftp_dir)
ftp.set_pasv(passive)
ftp.connect(ftp_server, ftp_port)
ftp.login(login, password)
- if ftp_dir <> '/':
+ if ftp_dir != '/':
ftp.cwd(ftp_dir)
lines = []
# The server does not implement LIST -R and
# treats -R as a name of a directory (-:
ftp.quit()
- raise FtpScanError, "the server does not implement recursive listing"
+ raise FtpScanError("the server does not implement recursive listing")
ftp.quit()
tree = []
tree.append((current_dir, files))
if line[:2] == "./":
line = line[1:] # remove leading dot
- elif line[0] <> '/':
+ elif line[0] != '/':
line = '/' + line
current_dir = line[:-1]
files = []
tree.append((current_dir, files))
if len(tree) == 1:
- raise FtpScanError, "the server ignores -R in LIST"
+ raise FtpScanError("the server ignores -R in LIST")
return tree
print("Scanning", ftp_server)
try:
test(ftp_server, ftpscanrecursive, passive)
- except FtpScanError, msg:
+ except FtpScanError as msg:
print("Rescanning due to the error:", msg)
try:
test(ftp_server, ftpscan1, passive)