X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_lib%2Fnet%2Fftp%2Fftpscan.py;h=eb0681c130bd8bdee61c1871f8154512cb4a1a2e;hb=6af016dd69398088ee255c5376c21f1c20075062;hp=469e44be58882796908c8546927cb156da6c1596;hpb=87ed070d1b1776366d3ddd15eef1f37a45c585ea;p=m_lib.git

diff --git a/m_lib/net/ftp/ftpscan.py b/m_lib/net/ftp/ftpscan.py
index 469e44b..eb0681c 100755
--- a/m_lib/net/ftp/ftpscan.py
+++ b/m_lib/net/ftp/ftpscan.py
@@ -3,8 +3,10 @@
 
 
 from __future__ import print_function
+import codecs
 import ftplib
-from m_lib.net.ftp.ftpparse import ftpparse
+import sys
+from .ftpparse import ftpparse
 
 
 class FtpScanError(Exception): pass
@@ -61,7 +63,7 @@ class ReconnectingFTPCallWrapper:
 class ReconnectingFTPWrapper:
    ReconnectingFTPCallWrapperClass = ReconnectingFTPCallWrapper
 
-   def __init__(self, ftp, ftp_server, ftp_port=None, login=None, password=None, ftp_dir='/', tree=None):
+   def __init__(self, ftp, ftp_server, ftp_port=0, login=None, password=None, ftp_dir='/', tree=None):
       self._ftp = ftp
       self._ftp_server = ftp_server
       self._ftp_port = ftp_port
@@ -121,7 +123,7 @@ def _traverse_ftp(ftp, tree, ftp_dir):
          ftp.cwd("..")
 
 
-def ftpscan1(ftp_server, ftp_port=None, login=None, password=None,
+def ftpscan1(ftp_server, ftp_port=0, login=None, password=None,
       ftp_dir='/', passive=None, FTPClass=ftplib.FTP, reconnect=False,
       ReconnectingFTPWrapperClass=ReconnectingFTPWrapper):
    """Recursive FTP scan using one-by-one directory traversing. It is slow
@@ -144,7 +146,7 @@ def ftpscan1(ftp_server, ftp_port=None, login=None, password=None,
    return tree
 
 
-def ftpscanrecursive(ftp_server, ftp_port=None, login=None, password=None,
+def ftpscanrecursive(ftp_server, ftp_port=0, login=None, password=None,
       ftp_dir='/', passive=None, FTPClass=ftplib.FTP, reconnect=False):
    """
    Recursive FTP scan using fast LIST -R command. Not all servers supports
@@ -165,7 +167,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 = []
@@ -193,12 +195,12 @@ 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
 
 
-def ftpscan(ftp_server, ftp_port=None, login=None, password=None,
+def ftpscan(ftp_server, ftp_port=0, login=None, password=None,
       ftp_dir='/', passive=None, FTPClass=ftplib.FTP):
    try:
       return ftpscanrecursive(ftp_server, ftp_port, login, password, ftp_dir, passive, FTPClass)
@@ -221,7 +223,10 @@ def test(ftp_server, func, passive=None, reconnect=False):
    print(stop_time - start_time)
 
    logfname = "%s.list" % ftp_server
-   log = open(logfname, 'w')
+   if sys.version_info[0] >= 3:
+       log = codecs.open(logfname, 'w', encoding='utf-8')
+   else:
+       log = open(logfname, 'w')
 
    for ftp_dir, files in tree:
       if ftp_dir == ftpscan_error_mark: