From c182925850e9777b0fda65a09fad595c7b737880 Mon Sep 17 00:00:00 2001 From: Carlos Almeida Date: Sat, 17 Oct 2015 02:03:59 -0300 Subject: [PATCH] [FIX] flake8 fixes --- document_ftp/__init__.py | 5 ++--- document_ftp/ftpserver/__init__.py | 31 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/document_ftp/__init__.py b/document_ftp/__init__.py index 098e6cb7..f5385e0a 100644 --- a/document_ftp/__init__.py +++ b/document_ftp/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -17,7 +17,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -26,4 +26,3 @@ from . import wizard from . import res_config post_load = ftpserver.start_server - diff --git a/document_ftp/ftpserver/__init__.py b/document_ftp/ftpserver/__init__.py index 5d54c3ae..4f4dcb46 100644 --- a/document_ftp/ftpserver/__init__.py +++ b/document_ftp/ftpserver/__init__.py @@ -24,9 +24,9 @@ import threading import logging -import document_ftp.ftpserver.Authorizer -import document_ftp.ftpserver.AbstractedFs -import document_ftp.ftpserver.FtpServer +import document_ftp.ftpserver.authorizer +import document_ftp.ftpserver.abstracted_fs +import document_ftp.ftpserver.ftp_server import openerp from openerp.tools import config @@ -38,8 +38,9 @@ def start_server(): if openerp.multi_process: _logger.info("FTP disabled in multiprocess mode") return - ip_address = ([(s.connect(('8.8.8.8', 80)), s.getsockname()[0], s.close()) - for s in [socket.socket(socket.AF_INET, socket.SOCK_DGRAM)]][0][1]) + ip_address = ([(s.connect(('8.8.8.8', 80)), s.getsockname()[0], s.close()) + for s in [socket.socket(socket.AF_INET, + socket.SOCK_DGRAM)]][0][1]) if not ip_address: ip_address = '127.0.0.1' HOST = config.get('ftp_server_host', str(ip_address)) @@ -52,19 +53,19 @@ def start_server(): class FtpServer(threading.Thread): def run(self): - autho = Authorizer.Authorizer() - FtpServer.FTPHandler.Authorizer = autho - FtpServer.max_cons = 300 - FtpServer.max_cons_per_ip = 50 - FtpServer.FTPHandler.AbstractedFs = AbstractedFs.AbstractedFs + autho = authorizer.Authorizer() + ftp_server.FTPHandler.Authorizer = autho + ftp_server.max_cons = 300 + ftp_server.max_cons_per_ip = 50 + ftp_server.FTPHandler.AbstractedFs = abstracted_fs.AbstractedFs if PASSIVE_PORTS: - FtpServer.FTPHandler.passive_ports = PASSIVE_PORTS + ftp_server.FTPHandler.passive_ports = PASSIVE_PORTS - FtpServer.log = lambda msg: _logger.info(msg) - FtpServer.logline = lambda msg: None - FtpServer.logerror = lambda msg: _logger.error(msg) + ftp_server.log = lambda msg: _logger.info(msg) + ftp_server.logline = lambda msg: None + ftp_server.logerror = lambda msg: _logger.error(msg) - ftpd = FtpServer.FTPServer((HOST, PORT), FtpServer.FTPHandler) + ftpd = ftp_server.FTPServer((HOST, PORT), ftp_server.FTPHandler) ftpd.serve_forever() if HOST.lower() == 'none':