From b4fe3474e7ee3dc90f2ff44a16f10dbbca8136f7 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Wed, 31 Oct 2018 10:04:18 -0400 Subject: [PATCH] Fix/ignore errors caused by a pycodestyle upgrade --- scripts/xsslint/tests/test_main.py | 38 +++++++++++++++--------------- setup.cfg | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/xsslint/tests/test_main.py b/scripts/xsslint/tests/test_main.py index ea3fa38814ac..e8e272131bd6 100644 --- a/scripts/xsslint/tests/test_main.py +++ b/scripts/xsslint/tests/test_main.py @@ -76,24 +76,24 @@ def test_lint_defaults(self): output = self.out.getvalue() # Assert violation details are displayed. - self.assertIsNotNone(re.search('test\.html.*{}'.format(self.ruleset.mako_missing_default.rule_id), output)) - self.assertIsNotNone(re.search('test\.js.*{}'.format(self.ruleset.javascript_concat_html.rule_id), output)) - self.assertIsNotNone(re.search('test\.js.*{}'.format(self.ruleset.underscore_not_escaped.rule_id), output)) + self.assertIsNotNone(re.search(r'test\.html.*{}'.format(self.ruleset.mako_missing_default.rule_id), output)) + self.assertIsNotNone(re.search(r'test\.js.*{}'.format(self.ruleset.javascript_concat_html.rule_id), output)) + self.assertIsNotNone(re.search(r'test\.js.*{}'.format(self.ruleset.underscore_not_escaped.rule_id), output)) lines_with_rule = 0 lines_without_rule = 0 # Output with verbose setting only. - for underscore_match in re.finditer('test\.underscore:.*\n', output): + for underscore_match in re.finditer(r'test\.underscore:.*\n', output): if re.search(self.ruleset.underscore_not_escaped.rule_id, underscore_match.group()) is not None: lines_with_rule += 1 else: lines_without_rule += 1 self.assertGreaterEqual(lines_with_rule, 1) self.assertEquals(lines_without_rule, 0) - self.assertIsNone(re.search('test\.py.*{}'.format(self.ruleset.python_parse_error.rule_id), output)) - self.assertIsNotNone(re.search('test\.py.*{}'.format(self.ruleset.python_wrap_html.rule_id), output)) + self.assertIsNone(re.search(r'test\.py.*{}'.format(self.ruleset.python_parse_error.rule_id), output)) + self.assertIsNotNone(re.search(r'test\.py.*{}'.format(self.ruleset.python_wrap_html.rule_id), output)) # Assert no rule totals. - self.assertIsNone(re.search('{}:\s*{} violations'.format(self.ruleset.python_parse_error.rule_id, 0), output)) + self.assertIsNone(re.search(r'{}:\s*{} violations'.format(self.ruleset.python_parse_error.rule_id, 0), output)) # Assert final total - self.assertIsNotNone(re.search('{} violations total'.format(7), output)) + self.assertIsNotNone(re.search(r'{} violations total'.format(7), output)) def test_lint_with_verbose(self): """ @@ -115,7 +115,7 @@ def test_lint_with_verbose(self): output = self.out.getvalue() lines_with_rule = 0 lines_without_rule = 0 # Output with verbose setting only. - for underscore_match in re.finditer('test\.underscore:.*\n', output): + for underscore_match in re.finditer(r'test\.underscore:.*\n', output): if re.search(self.ruleset.underscore_not_escaped.rule_id, underscore_match.group()) is not None: lines_with_rule += 1 else: @@ -123,9 +123,9 @@ def test_lint_with_verbose(self): self.assertGreaterEqual(lines_with_rule, 1) self.assertGreaterEqual(lines_without_rule, 1) # Assert no rule totals. - self.assertIsNone(re.search('{}:\s*{} violations'.format(self.ruleset.python_parse_error.rule_id, 0), output)) + self.assertIsNone(re.search(r'{}:\s*{} violations'.format(self.ruleset.python_parse_error.rule_id, 0), output)) # Assert final total - self.assertIsNotNone(re.search('{} violations total'.format(7), output)) + self.assertIsNotNone(re.search(r'{} violations total'.format(7), output)) def test_lint_with_rule_totals(self): """ @@ -145,12 +145,12 @@ def test_lint_with_rule_totals(self): ) output = self.out.getvalue() - self.assertIsNotNone(re.search('test\.py.*{}'.format(self.ruleset.python_wrap_html.rule_id), output)) + self.assertIsNotNone(re.search(r'test\.py.*{}'.format(self.ruleset.python_wrap_html.rule_id), output)) # Assert totals output. - self.assertIsNotNone(re.search('{}:\s*{} violations'.format(self.ruleset.python_parse_error.rule_id, 0), output)) - self.assertIsNotNone(re.search('{}:\s*{} violations'.format(self.ruleset.python_wrap_html.rule_id, 1), output)) - self.assertIsNotNone(re.search('{} violations total'.format(7), output)) + self.assertIsNotNone(re.search(r'{}:\s*{} violations'.format(self.ruleset.python_parse_error.rule_id, 0), output)) + self.assertIsNotNone(re.search(r'{}:\s*{} violations'.format(self.ruleset.python_wrap_html.rule_id, 1), output)) + self.assertIsNotNone(re.search(r'{} violations total'.format(7), output)) def test_lint_with_list_files(self): """ @@ -171,10 +171,10 @@ def test_lint_with_list_files(self): output = self.out.getvalue() # Assert file with rule is not output. - self.assertIsNone(re.search('test\.py.*{}'.format(self.ruleset.python_wrap_html.rule_id), output)) + self.assertIsNone(re.search(r'test\.py.*{}'.format(self.ruleset.python_wrap_html.rule_id), output)) # Assert file is output. - self.assertIsNotNone(re.search('test\.py', output)) + self.assertIsNotNone(re.search(r'test\.py', output)) # Assert no totals. - self.assertIsNone(re.search('{}:\s*{} violations'.format(self.ruleset.python_parse_error.rule_id, 0), output)) - self.assertIsNone(re.search('{} violations total'.format(7), output)) + self.assertIsNone(re.search(r'{}:\s*{} violations'.format(self.ruleset.python_parse_error.rule_id, 0), output)) + self.assertIsNone(re.search(r'{} violations total'.format(7), output)) diff --git a/setup.cfg b/setup.cfg index 711a3b966d7f..35c89aa0a389 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,9 +28,9 @@ python_files = tests.py test_*.py tests_*.py *_tests.py __init__.py # http://nedbatchelder.com/blog/200711/rethrowing_exceptions_in_python.html # It's a little unusual, but we have good reasons for doing so, so we disable # this rule. -# E305,E402,E722,E731,E741,E743,W503: errors and warnings added since pep8/pycodestyle +# E305,E402,E722,E731,E741,E743,W503,W504: errors and warnings added since pep8/pycodestyle # 1.5.7 that we haven't cleaned up yet -ignore=E265,E266,E305,E402,E501,E722,E731,E741,E743,W503,W602 +ignore=E265,E266,E305,E402,E501,E722,E731,E741,E743,W503,W504,W602 exclude=migrations,.git,.pycharm_helpers,.tox,test_root/staticfiles,node_modules [isort]