X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_lib%2Fnet%2Fftp%2Fftpscan.py;h=51c92f36c9f799f9f3dc319a540861d5dcddb194;hb=3f0f88bf83f84474c61efacfbf14cdbeb22f30e3;hp=f12ef3e1af1e170ecc22e84ce9347aa9278a5ba4;hpb=c0a3ca4a622dadfa767404da3c366443bab0f791;p=m_lib.git

diff --git a/m_lib/net/ftp/ftpscan.py b/m_lib/net/ftp/ftpscan.py
index f12ef3e..51c92f3 100755
--- a/m_lib/net/ftp/ftpscan.py
+++ b/m_lib/net/ftp/ftpscan.py
@@ -4,7 +4,7 @@
 
 from __future__ import print_function
 import ftplib
-from m_lib.net.ftp.ftpparse import ftpparse
+from .ftpparse import ftpparse
 
 
 class FtpScanError(Exception): pass
@@ -135,7 +135,7 @@ def ftpscan1(ftp_server, ftp_port=None, login=None, password=None,
       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)
@@ -155,7 +155,7 @@ def ftpscanrecursive(ftp_server, ftp_port=None, login=None, password=None,
       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 = []
@@ -165,7 +165,7 @@ def ftpscanrecursive(ftp_server, ftp_port=None, login=None, password=None,
       # 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 = []
@@ -178,7 +178,7 @@ def ftpscanrecursive(ftp_server, ftp_port=None, login=None, password=None,
             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 = []
@@ -193,7 +193,7 @@ def ftpscanrecursive(ftp_server, ftp_port=None, login=None, password=None,
    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