]> git.phdru.name Git - m_lib.git/commitdiff
Fix log file encoding in ftpscan.py
authorOleg Broytman <phd@phdru.name>
Sun, 23 Apr 2017 20:41:24 +0000 (23:41 +0300)
committerOleg Broytman <phd@phdru.name>
Sun, 23 Apr 2017 20:41:24 +0000 (23:41 +0300)
m_lib/net/ftp/ftpscan.py

index ebff998f72a2c1c50ef0bd03bc537674a18618b4..eb0681c130bd8bdee61c1871f8154512cb4a1a2e 100755 (executable)
@@ -5,6 +5,7 @@
 from __future__ import print_function
 import codecs
 import ftplib
+import sys
 from .ftpparse import ftpparse
 
 
@@ -222,7 +223,10 @@ def test(ftp_server, func, passive=None, reconnect=False):
    print(stop_time - start_time)
 
    logfname = "%s.list" % ftp_server
-   log = codecs.open(logfname, 'w', encoding='utf-8')
+   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: