NeoAnd/knowledge
1
0
Fork 0
mirror of https://github.com/OCA/knowledge.git synced 2025-07-26 02:18:40 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] flake8 fixes

Browse Source
This commit is contained in:
Carlos Almeida 2015-10-17 02:03:59 -03:00
parent 54520fb4f6
commit c182925850
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
document_ftp/__init__.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -17,7 +17,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -26,4 +26,3 @@ from . import wizard
from . import res_config from . import res_config
post_load = ftpserver.start_server post_load = ftpserver.start_server

31
document_ftp/ftpserver/__init__.py
View File

@ -24,9 +24,9 @@
import threading import threading
import logging import logging
import document_ftp.ftpserver.Authorizer import document_ftp.ftpserver.authorizer
import document_ftp.ftpserver.AbstractedFs import document_ftp.ftpserver.abstracted_fs
import document_ftp.ftpserver.FtpServer import document_ftp.ftpserver.ftp_server
import openerp import openerp
from openerp.tools import config from openerp.tools import config
@ -38,8 +38,9 @@ def start_server():
if openerp.multi_process: if openerp.multi_process:
_logger.info("FTP disabled in multiprocess mode") _logger.info("FTP disabled in multiprocess mode")
return return
ip_address = ([(s.connect(('8.8.8.8', 80)), s.getsockname()[0], s.close()) 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]) for s in [socket.socket(socket.AF_INET,
socket.SOCK_DGRAM)]][0][1])
if not ip_address: if not ip_address:
ip_address = '127.0.0.1' ip_address = '127.0.0.1'
HOST = config.get('ftp_server_host', str(ip_address)) HOST = config.get('ftp_server_host', str(ip_address))
@ -52,19 +53,19 @@ def start_server():
class FtpServer(threading.Thread): class FtpServer(threading.Thread):
def run(self): def run(self):
autho = Authorizer.Authorizer() autho = authorizer.Authorizer()
FtpServer.FTPHandler.Authorizer = autho ftp_server.FTPHandler.Authorizer = autho
FtpServer.max_cons = 300 ftp_server.max_cons = 300
FtpServer.max_cons_per_ip = 50 ftp_server.max_cons_per_ip = 50
FtpServer.FTPHandler.AbstractedFs = AbstractedFs.AbstractedFs ftp_server.FTPHandler.AbstractedFs = abstracted_fs.AbstractedFs
if PASSIVE_PORTS: if PASSIVE_PORTS:
FtpServer.FTPHandler.passive_ports = PASSIVE_PORTS ftp_server.FTPHandler.passive_ports = PASSIVE_PORTS
FtpServer.log = lambda msg: _logger.info(msg) ftp_server.log = lambda msg: _logger.info(msg)
FtpServer.logline = lambda msg: None ftp_server.logline = lambda msg: None
FtpServer.logerror = lambda msg: _logger.error(msg) 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() ftpd.serve_forever()
if HOST.lower() == 'none': if HOST.lower() == 'none':