From 5a0433bc5d37b731f9972c19782ae9973bf74c01 Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Date: Tue, 29 Aug 2017 11:16:49 -0700
Subject: [PATCH] update style to satisfy new flake8 plugins

---
 .../cmake/core/package_xml_2_cmake.py         |  2 +-
 ament_cmake_test/cmake/run_test.py            | 26 +++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/ament_cmake_core/cmake/core/package_xml_2_cmake.py b/ament_cmake_core/cmake/core/package_xml_2_cmake.py
index 937d5c44..c1e71f52 100644
--- a/ament_cmake_core/cmake/core/package_xml_2_cmake.py
+++ b/ament_cmake_core/cmake/core/package_xml_2_cmake.py
@@ -23,7 +23,7 @@
 except ImportError as e:
     sys.exit("ImportError: 'from ament_package import parse_package_string' "
              "failed: %s\nMake sure that you have installed 'ament_package', "
-             "it is up to date and on the PYTHONPATH." % e)
+             'it is up to date and on the PYTHONPATH.' % e)
 
 
 def main(argv=sys.argv[1:]):
diff --git a/ament_cmake_test/cmake/run_test.py b/ament_cmake_test/cmake/run_test.py
index 974e3819..7667b4eb 100644
--- a/ament_cmake_test/cmake/run_test.py
+++ b/ament_cmake_test/cmake/run_test.py
@@ -19,8 +19,8 @@
 import errno
 import os
 import re
-import sys
 import subprocess
+import sys
 from xml.etree.ElementTree import ElementTree
 from xml.etree.ElementTree import ParseError
 from xml.sax.saxutils import quoteattr
@@ -91,10 +91,7 @@ def main(argv=sys.argv[1:]):
 
     if args.skip_test:
         # generate a skipped test result file
-        skipped_result_file = _generate_result(
-            args.result_file,
-            skip=True
-        )
+        skipped_result_file = _generate_result(args.result_file, skip=True)
         with open(args.result_file, 'w') as h:
             h.write(skipped_result_file)
         return 0
@@ -103,8 +100,7 @@ def main(argv=sys.argv[1:]):
     # in case the command segfaults or timeouts and does not generate one
     failure_result_file = _generate_result(
         args.result_file,
-        failure_message='The test did not generate a result file.'
-    )
+        failure_message='The test did not generate a result file.')
     with open(args.result_file, 'w') as h:
         h.write(failure_result_file)
 
@@ -173,8 +169,7 @@ def log(msg, **kwargs):
     try:
         proc = subprocess.Popen(
             args.command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
-            env=env
-        )
+            env=env)
         while True:
             line = proc.stdout.readline()
             if not line:
@@ -219,8 +214,7 @@ def log(msg, **kwargs):
             # regenerate result file to include output / exception of the invoked command
             failure_result_file = _generate_result(
                 args.result_file,
-                failure_message='The test did not generate a result file:\n\n' + output
-            )
+                failure_message='The test did not generate a result file:\n\n' + output)
             with open(args.result_file, 'w') as h:
                 h.write(failure_result_file)
 
@@ -273,12 +267,12 @@ def _generate_result(result_file, *, failure_message=None, skip=False):
     skipped_message = \
         '<skipped type="skip" message="">![CDATA[Test Skipped by developer]]</skipped>' \
         if skip else ''
-    return '''<?xml version="1.0" encoding="UTF-8"?>
+    return """<?xml version="1.0" encoding="UTF-8"?>
 <testsuite name="%s" tests="1" failures="%d" time="0" errors="0" skip="%d">
   <testcase classname="%s" name="%s.missing_result" status="%s" time="0">
     %s%s
   </testcase>
-</testsuite>\n''' % \
+</testsuite>\n""" % \
         (
             pkgname,
             1 if failure_message else 0,
@@ -314,7 +308,7 @@ def _tidy_xml(filename):
         char = unichr
     except NameError:
         char = chr
-    RE_XML_ILLEGAL = (
+    re_xml_illegal = (
         '([%s-%s%s-%s%s-%s%s-%s])' +
         '|' +
         '([%s-%s][^%s-%s])|([^%s-%s][%s-%s])|([%s-%s]$)|(^[%s-%s])') % \
@@ -323,9 +317,9 @@ def _tidy_xml(filename):
          char(0xd800), char(0xdbff), char(0xdc00), char(0xdfff),
          char(0xd800), char(0xdbff), char(0xdc00), char(0xdfff),
          char(0xd800), char(0xdbff), char(0xdc00), char(0xdfff))
-    SAFE_XML_REGEX = re.compile(RE_XML_ILLEGAL)
+    safe_xml_regex = re.compile(re_xml_illegal)
 
-    for match in SAFE_XML_REGEX.finditer(data):
+    for match in safe_xml_regex.finditer(data):
         data = data[:match.start()] + '?' + data[match.end():]
 
     with open(filename, 'w') as h: