diff --git a/pre_commit_hooks/loaderon_hooks/general_hooks/check_branch_name.py b/pre_commit_hooks/loaderon_hooks/general_hooks/check_branch_name.py index e100847..d787692 100644 --- a/pre_commit_hooks/loaderon_hooks/general_hooks/check_branch_name.py +++ b/pre_commit_hooks/loaderon_hooks/general_hooks/check_branch_name.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import re -from pre_commit_logic.util.template_methods.checker_template_method import CheckerTemplateMethod -from pre_commit_logic.util.git_helpers import get_current_branch_name +from pre_commit_hooks.loaderon_hooks.util.git_helpers import get_current_branch_name +from pre_commit_hooks.loaderon_hooks.util.template_methods.checker_template_method import CheckerTemplateMethod class BranchNameChecker(CheckerTemplateMethod): diff --git a/pre_commit_hooks/loaderon_hooks/general_hooks/check_class_docstring.py b/pre_commit_hooks/loaderon_hooks/general_hooks/check_class_docstring.py index 4098e73..fa98499 100644 --- a/pre_commit_hooks/loaderon_hooks/general_hooks/check_class_docstring.py +++ b/pre_commit_hooks/loaderon_hooks/general_hooks/check_class_docstring.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- import re -from pre_commit_logic.util.template_methods.lines_checker_template_method import LinesCheckerTemplateMethod +from pre_commit_hooks.loaderon_hooks.util.template_methods.lines_checker_template_method import \ + LinesCheckerTemplateMethod class ClassDocstringChecker(LinesCheckerTemplateMethod): diff --git a/pre_commit_hooks/loaderon_hooks/general_hooks/check_line.py b/pre_commit_hooks/loaderon_hooks/general_hooks/check_line.py index 6fd4789..4fef1ef 100644 --- a/pre_commit_hooks/loaderon_hooks/general_hooks/check_line.py +++ b/pre_commit_hooks/loaderon_hooks/general_hooks/check_line.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- import re -from pre_commit_logic.util.template_methods.lines_checker_template_method import LinesCheckerTemplateMethod +from pre_commit_hooks.loaderon_hooks.util.template_methods.lines_checker_template_method import \ + LinesCheckerTemplateMethod class LinesChecker(LinesCheckerTemplateMethod): diff --git a/pre_commit_hooks/loaderon_hooks/general_hooks/check_location.py b/pre_commit_hooks/loaderon_hooks/general_hooks/check_location.py index 3fe84c9..f4daa2e 100644 --- a/pre_commit_hooks/loaderon_hooks/general_hooks/check_location.py +++ b/pre_commit_hooks/loaderon_hooks/general_hooks/check_location.py @@ -3,8 +3,8 @@ import os import re -from pre_commit_logic.util.template_methods.file_checker_template_method import FileCheckerTemplateMethod -from pre_commit_logic.util.string_helpers import matches_any_regexp +from pre_commit_hooks.loaderon_hooks.util.string_helpers import matches_any_regexp +from pre_commit_hooks.loaderon_hooks.util.template_methods.file_checker_template_method import FileCheckerTemplateMethod class LocationChecker(FileCheckerTemplateMethod): diff --git a/pre_commit_hooks/loaderon_hooks/general_hooks/check_using_pylint.py b/pre_commit_hooks/loaderon_hooks/general_hooks/check_using_pylint.py index 83e0265..9fee0a3 100644 --- a/pre_commit_hooks/loaderon_hooks/general_hooks/check_using_pylint.py +++ b/pre_commit_hooks/loaderon_hooks/general_hooks/check_using_pylint.py @@ -5,8 +5,8 @@ import re from pylint.lint import Run from pylint.reporters.text import TextReporter -from pre_commit_logic.util.template_methods.file_checker_template_method import FileCheckerTemplateMethod -from pre_commit_logic.util.file_helpers import find_file_starting_from_reference_file_directory +from pre_commit_hooks.loaderon_hooks.util.file_helpers import find_file_starting_from_reference_file_directory +from pre_commit_hooks.loaderon_hooks.util.template_methods.file_checker_template_method import FileCheckerTemplateMethod class PylintChecker(FileCheckerTemplateMethod): @@ -39,7 +39,7 @@ class PylintChecker(FileCheckerTemplateMethod): Run([self.filename], reporter=TextReporter(self.pylint_output)) def manage_pylint_result(self, exception): - print self.pylint_output.read() + print(self.pylint_output.read()) if exception.code != 0: self.inform_check_failure('') diff --git a/pre_commit_hooks/loaderon_hooks/general_hooks/check_xml_encoding.py b/pre_commit_hooks/loaderon_hooks/general_hooks/check_xml_encoding.py index 81748d4..968613d 100644 --- a/pre_commit_hooks/loaderon_hooks/general_hooks/check_xml_encoding.py +++ b/pre_commit_hooks/loaderon_hooks/general_hooks/check_xml_encoding.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- - -from pre_commit_logic.util.template_methods.file_checker_template_method import FileCheckerTemplateMethod -from pre_commit_logic.util.file_helpers import read_file_line +from pre_commit_hooks.loaderon_hooks.util.file_helpers import read_file_line +from pre_commit_hooks.loaderon_hooks.util.template_methods.file_checker_template_method import FileCheckerTemplateMethod class XMLEncodingChecker(FileCheckerTemplateMethod): diff --git a/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_model_name.py b/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_model_name.py index e0de223..f2adba3 100644 --- a/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_model_name.py +++ b/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_model_name.py @@ -2,7 +2,7 @@ import os import re -from pre_commit_logic.util.template_methods.file_bunches_lines_checker_template_method import \ +from pre_commit_hooks.loaderon_hooks.util.template_methods.file_bunches_lines_checker_template_method import \ FileBunchesLinesCheckerTemplateMethod diff --git a/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_view_fields_order.py b/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_view_fields_order.py index 22195a3..a5ecfb2 100644 --- a/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_view_fields_order.py +++ b/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_view_fields_order.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pre_commit_logic.util.template_methods.files_bunches_checker_template_method import \ +from pre_commit_hooks.loaderon_hooks.util.template_methods.files_bunches_checker_template_method import \ FileBunchesCheckerTemplateMethod diff --git a/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_view_name.py b/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_view_name.py index c627b21..575630c 100644 --- a/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_view_name.py +++ b/pre_commit_hooks/loaderon_hooks/odoo_specific_hooks/check_view_name.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pre_commit_logic.odoo_specific_hooks.check_view_fields_order import ViewFieldsOrderChecker +from pre_commit_hooks.loaderon_hooks.odoo_specific_hooks.check_view_fields_order import ViewFieldsOrderChecker class ViewNameChecker(ViewFieldsOrderChecker): diff --git a/pre_commit_hooks/loaderon_hooks/tests/manual_testing/runner.py b/pre_commit_hooks/loaderon_hooks/tests/manual_testing/runner.py index 8b3a7eb..0e454ab 100644 --- a/pre_commit_hooks/loaderon_hooks/tests/manual_testing/runner.py +++ b/pre_commit_hooks/loaderon_hooks/tests/manual_testing/runner.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- import sys -from pre_commit_logic.general_hooks.check_branch_name import BranchNameChecker -from pre_commit_logic.general_hooks.check_class_docstring import ClassDocstringChecker -from pre_commit_logic.general_hooks.check_line import LinesChecker -from pre_commit_logic.general_hooks.check_location import LocationChecker -from pre_commit_logic.general_hooks.check_using_pylint import PylintChecker -from pre_commit_logic.general_hooks.check_xml_encoding import XMLEncodingChecker -from pre_commit_logic.odoo_specific_hooks.check_model_name import ModelNameAttributeChecker +from pre_commit_hooks.loaderon_hooks.general_hooks.check_branch_name import BranchNameChecker +from pre_commit_hooks.loaderon_hooks.general_hooks.check_class_docstring import ClassDocstringChecker +from pre_commit_hooks.loaderon_hooks.general_hooks.check_line import LinesChecker +from pre_commit_hooks.loaderon_hooks.general_hooks.check_location import LocationChecker +from pre_commit_hooks.loaderon_hooks.general_hooks.check_using_pylint import PylintChecker +from pre_commit_hooks.loaderon_hooks.general_hooks.check_xml_encoding import XMLEncodingChecker +from pre_commit_hooks.loaderon_hooks.odoo_specific_hooks.check_model_name import ModelNameAttributeChecker def run_model_name_checker(): @@ -41,7 +41,7 @@ def run_line_checker(): sys.argv.append('--line-to-check') sys.argv.append(r'class.+') - #Regexp for knowing how the line must be in order to be correct. + # Regexp for knowing how the line must be in order to be correct. sys.argv.append('--regexp-to-match') sys.argv.append(r'^(\t| )*