From 2540f699b4c7991552ef481ef1fddc9639e134dd Mon Sep 17 00:00:00 2001 From: moylop260 Date: Thu, 13 Nov 2014 18:13:05 -0600 Subject: [PATCH] Fix Pylint warnings --- account_advanced_reconcile/__init__.py | 6 +++--- account_easy_reconcile/__init__.py | 10 +++++----- account_statement_base_completion/statement.py | 2 +- account_statement_base_import/__init__.py | 6 +++--- account_statement_base_import/parser/__init__.py | 8 ++++---- account_statement_base_import/parser/file_parser.py | 4 ++-- .../parser/generic_file_parser.py | 2 +- account_statement_base_import/statement.py | 3 +-- account_statement_base_import/wizard/__init__.py | 2 +- account_statement_cancel_line/__init__.py | 6 +++--- account_statement_cancel_line/wizard/__init__.py | 4 ++-- account_statement_commission/__init__.py | 2 +- account_statement_ext/__init__.py | 8 ++++---- account_statement_ext/report/__init__.py | 2 +- account_statement_ext/statement.py | 2 +- account_statement_ofx_import/__init__.py | 4 ++-- .../statement.py | 4 ++-- account_statement_transactionid_completion/__init__.py | 2 +- account_statement_transactionid_import/__init__.py | 4 ++-- .../parser/__init__.py | 2 +- 20 files changed, 41 insertions(+), 42 deletions(-) diff --git a/account_advanced_reconcile/__init__.py b/account_advanced_reconcile/__init__.py index 5ee0093a..e1a57902 100644 --- a/account_advanced_reconcile/__init__.py +++ b/account_advanced_reconcile/__init__.py @@ -20,6 +20,6 @@ # ############################################################################## -import easy_reconcile -import base_advanced_reconciliation -import advanced_reconciliation +from . import easy_reconcile +from . import base_advanced_reconciliation +from . import advanced_reconciliation diff --git a/account_easy_reconcile/__init__.py b/account_easy_reconcile/__init__.py index 87ea0fc3..0b0a2b53 100755 --- a/account_easy_reconcile/__init__.py +++ b/account_easy_reconcile/__init__.py @@ -19,8 +19,8 @@ # ############################################################################## -import easy_reconcile -import base_reconciliation -import simple_reconciliation -import easy_reconcile_history -import res_config +from . import easy_reconcile +from . import base_reconciliation +from . import simple_reconciliation +from . import easy_reconcile_history +from . import res_config diff --git a/account_statement_base_completion/statement.py b/account_statement_base_completion/statement.py index 4edf3cf3..12bf2d31 100644 --- a/account_statement_base_completion/statement.py +++ b/account_statement_base_completion/statement.py @@ -329,7 +329,7 @@ class AccountStatementCompletionRule(orm.Model): # to: # http://www.postgresql.org/docs/9.0/static/functions-matching.html # in chapter 9.7.3.6. Limits and Compatibility - sql = """ + sql = r""" SELECT id FROM ( SELECT id, regexp_matches(%s, diff --git a/account_statement_base_import/__init__.py b/account_statement_base_import/__init__.py index 7c864205..2fe60a3e 100644 --- a/account_statement_base_import/__init__.py +++ b/account_statement_base_import/__init__.py @@ -18,6 +18,6 @@ # along with this program. If not, see . # ############################################################################## -import parser -import wizard -import statement +from . import parser +from . import wizard +from . import statement diff --git a/account_statement_base_import/parser/__init__.py b/account_statement_base_import/parser/__init__.py index c802d6b1..cb73080b 100644 --- a/account_statement_base_import/parser/__init__.py +++ b/account_statement_base_import/parser/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -from parser import new_bank_statement_parser -from parser import BankStatementImportParser -import file_parser -import generic_file_parser +from .parser import new_bank_statement_parser +from .parser import BankStatementImportParser +from . import file_parser +from . import generic_file_parser diff --git a/account_statement_base_import/parser/file_parser.py b/account_statement_base_import/parser/file_parser.py index ff8ee482..ac8dfbe0 100644 --- a/account_statement_base_import/parser/file_parser.py +++ b/account_statement_base_import/parser/file_parser.py @@ -21,8 +21,8 @@ from openerp.tools.translate import _ from openerp.osv.orm import except_orm import tempfile import datetime -from parser import BankStatementImportParser -from parser import UnicodeDictReader +from .parser import BankStatementImportParser +from .parser import UnicodeDictReader try: import xlrd except: diff --git a/account_statement_base_import/parser/generic_file_parser.py b/account_statement_base_import/parser/generic_file_parser.py index 9e5e1a96..47e98445 100644 --- a/account_statement_base_import/parser/generic_file_parser.py +++ b/account_statement_base_import/parser/generic_file_parser.py @@ -19,7 +19,7 @@ ############################################################################## import datetime -from file_parser import FileParser +from .file_parser import FileParser from openerp.addons.account_statement_base_import.parser.file_parser import ( float_or_zero ) diff --git a/account_statement_base_import/statement.py b/account_statement_base_import/statement.py index c87013b0..83e250f3 100644 --- a/account_statement_base_import/statement.py +++ b/account_statement_base_import/statement.py @@ -23,7 +23,7 @@ import traceback from openerp.tools.translate import _ import datetime from openerp.osv import fields, orm -from parser import new_bank_statement_parser +from .parser import new_bank_statement_parser from openerp.tools.config import config @@ -74,7 +74,6 @@ class AccountStatementProfil(orm.Model): statement ID :param: context: global context """ - pass def write_logs_after_import(self, cr, uid, ids, statement_id, num_lines, context): diff --git a/account_statement_base_import/wizard/__init__.py b/account_statement_base_import/wizard/__init__.py index 5dbd2b0c..888026df 100644 --- a/account_statement_base_import/wizard/__init__.py +++ b/account_statement_base_import/wizard/__init__.py @@ -17,4 +17,4 @@ # along with this program. If not, see . # ############################################################################## -import import_statement +from . import import_statement diff --git a/account_statement_cancel_line/__init__.py b/account_statement_cancel_line/__init__.py index 153ef95a..9ec2ed82 100644 --- a/account_statement_cancel_line/__init__.py +++ b/account_statement_cancel_line/__init__.py @@ -20,6 +20,6 @@ ############################################################################### """Account Statement Cancel Line.""" -import statement # noqa -import statement_line # noqa -import wizard # noqa +from . import statement # noqa +from . import statement_line # noqa +from . import wizard # noqa diff --git a/account_statement_cancel_line/wizard/__init__.py b/account_statement_cancel_line/wizard/__init__.py index 49b74d3f..89af38cf 100644 --- a/account_statement_cancel_line/wizard/__init__.py +++ b/account_statement_cancel_line/wizard/__init__.py @@ -20,5 +20,5 @@ ############################################################################### """Wizard for asking the confirmation when some move is reconciled.""" -import cancel_statement # noqa -import cancel_statement_line # noqa +from . import cancel_statement # noqa +from . import cancel_statement_line # noqa diff --git a/account_statement_commission/__init__.py b/account_statement_commission/__init__.py index 5ba29072..65fff538 100644 --- a/account_statement_commission/__init__.py +++ b/account_statement_commission/__init__.py @@ -19,4 +19,4 @@ # along with this program. If not, see . # ############################################################################## -import commission +from . import commission diff --git a/account_statement_ext/__init__.py b/account_statement_ext/__init__.py index 7bf22aa2..5e15fac6 100644 --- a/account_statement_ext/__init__.py +++ b/account_statement_ext/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -import statement -import report -import account -import voucher +from . import statement +from . import report +from . import account +from . import voucher diff --git a/account_statement_ext/report/__init__.py b/account_statement_ext/report/__init__.py index 14b13013..29a4bdaf 100644 --- a/account_statement_ext/report/__init__.py +++ b/account_statement_ext/report/__init__.py @@ -23,4 +23,4 @@ # ############################################################################## -import bank_statement_report +from . import bank_statement_report diff --git a/account_statement_ext/statement.py b/account_statement_ext/statement.py index a3a45a2d..748db07e 100644 --- a/account_statement_ext/statement.py +++ b/account_statement_ext/statement.py @@ -447,7 +447,7 @@ class AccountBankStatement(orm.Model): def get_account_for_counterpart(self, cr, uid, amount, account_receivable, account_payable): """For backward compatibility.""" - account_id, type = self.get_account_and_type_for_counterpart( + account_id, account_type = self.get_account_and_type_for_counterpart( cr, uid, amount, account_receivable, account_payable) return account_id diff --git a/account_statement_ofx_import/__init__.py b/account_statement_ofx_import/__init__.py index 19462c05..71e18ac5 100644 --- a/account_statement_ofx_import/__init__.py +++ b/account_statement_ofx_import/__init__.py @@ -18,5 +18,5 @@ # along with this program. If not, see . # ############################################################################## -import statement -import parser +from . import statement +from . import parser diff --git a/account_statement_regex_account_completion/statement.py b/account_statement_regex_account_completion/statement.py index 6a232b02..cc697de0 100644 --- a/account_statement_regex_account_completion/statement.py +++ b/account_statement_regex_account_completion/statement.py @@ -54,7 +54,7 @@ class AccountStatementCompletionRule(Model): string="Account to set"), } - def set_account(self, cr, uid, id, st_line, context=None): + def set_account(self, cr, uid, account_id, st_line, context=None): """ If line name match regex, update account_id Then, call the generic st_line method to complete other values. @@ -69,7 +69,7 @@ class AccountStatementCompletionRule(Model): name = st_line['name'] res = {} if name: - rule = self.browse(cr, uid, id, context=context) + rule = self.browse(cr, uid, account_id, context=context) if re.match(rule.regex, name): res['account_id'] = rule.account_id.id return res diff --git a/account_statement_transactionid_completion/__init__.py b/account_statement_transactionid_completion/__init__.py index a8ce7c24..647f811c 100644 --- a/account_statement_transactionid_completion/__init__.py +++ b/account_statement_transactionid_completion/__init__.py @@ -19,4 +19,4 @@ # ############################################################################## -import statement +from . import statement diff --git a/account_statement_transactionid_import/__init__.py b/account_statement_transactionid_import/__init__.py index 29698b5e..874730ea 100644 --- a/account_statement_transactionid_import/__init__.py +++ b/account_statement_transactionid_import/__init__.py @@ -18,5 +18,5 @@ # along with this program. If not, see . # ############################################################################## -import parser -import statement +from . import parser +from . import statement diff --git a/account_statement_transactionid_import/parser/__init__.py b/account_statement_transactionid_import/parser/__init__.py index de4553b9..9cc12870 100644 --- a/account_statement_transactionid_import/parser/__init__.py +++ b/account_statement_transactionid_import/parser/__init__.py @@ -19,4 +19,4 @@ # ############################################################################## -import transactionid_file_parser +from . import transactionid_file_parser