comply with flake8 import order

demo_nodes_py/package.xml

@@ -15,9 +15,8 @@
   <exec_depend>std_msgs</exec_depend>
 
   <test_depend>ament_copyright</test_depend>
+  <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
-  <test_depend>ament_pep8</test_depend>
-  <test_depend>ament_pyflakes</test_depend>
 
   <export>
     <build_type>ament_python</build_type>

demo_nodes_py/services/add_two_ints_client_async_py.py

@@ -14,10 +14,10 @@
 
 import time
 
-import rclpy
-
 from example_interfaces.srv import AddTwoInts
 
+import rclpy
+
 
 def main(args=None):
 
@@ -44,5 +44,6 @@ def main(args=None):
             cli.call(req)
         rclpy.spin_once(node)
 
+
 if __name__ == '__main__':
     main()

demo_nodes_py/services/add_two_ints_client_py.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import rclpy
-
 from example_interfaces.srv import AddTwoInts
 
+import rclpy
+
 
 def main(args=None):
     rclpy.init(args)
@@ -34,5 +34,6 @@ def main(args=None):
         print('Result of add_two_ints: %d' % cli.response.sum)
         i += 1
 
+
 if __name__ == '__main__':
     main()

demo_nodes_py/services/add_two_ints_server_py.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import rclpy
-
 from example_interfaces.srv import AddTwoInts
 
+import rclpy
+
 
 def add_two_ints_callback(request, response):
     response.sum = request.a + request.b
@@ -39,5 +39,7 @@ def main(args=None):
     # (optional - otherwise it will be done automatically
     # when the garbage collector destroys the node object)
     node.destroy_service(srv)
+
+
 if __name__ == '__main__':
     main()

demo_nodes_py/test/test_pyflakes.py → demo_nodes_py/test/test_flake8.py

@@ -1,4 +1,4 @@
-# Copyright 2015 Open Source Robotics Foundation, Inc.
+# Copyright 2017 Open Source Robotics Foundation, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ament_pyflakes.main import main
+from ament_flake8.main import main
 
 
 def test_pyflakes():
-    rc = main(argv=['.', 'test'])
+    rc = main(argv=[])
     assert rc == 0, 'Found errors'

demo_nodes_py/topics/listener_py.py

@@ -38,5 +38,6 @@ def main(args=None):
     while rclpy.ok():
         rclpy.spin_once(node)
 
+
 if __name__ == '__main__':
     main()

demo_nodes_py/topics/listener_qos_py.py

@@ -55,5 +55,6 @@ def main(argv=sys.argv[1:]):
         rclpy.spin_once(node)
         cycle_count += 1
 
+
 if __name__ == '__main__':
     main()

demo_nodes_py/topics/talker_py.py

@@ -43,5 +43,6 @@ def main(args=None):
         # TODO(wjwwood): need to spin_some or spin_once with timeout
         sleep(1)
 
+
 if __name__ == '__main__':
     main()

demo_nodes_py/topics/talker_qos_py.py

@@ -55,5 +55,6 @@ def main(argv=sys.argv[1:]):
         cycle_count += 1
         sleep(1)
 
+
 if __name__ == '__main__':
     main()