Fix import order.

Author: nuclearsandwich

bloom/commands/generate.py

@@ -36,14 +36,14 @@
 import argparse
 import sys
 
+from bloom.util import add_global_arguments
+from bloom.util import handle_global_arguments
+
 if sys.version_info[0:2] < (3, 10):
     from importlib_metadata import entry_points
 else:
     from importlib.metadata import entry_points
 
-from bloom.util import add_global_arguments
-from bloom.util import handle_global_arguments
-
 BLOOM_GENERATE_CMDS_GROUP = 'bloom.generate_cmds'
 
 

bloom/generators/common.py

@@ -35,11 +35,6 @@
 import sys
 import traceback
 
-if sys.version_info[0:2] < (3, 10):
-    from importlib_metadata import entry_points
-else:
-    from importlib.metadata import entry_points
-
 from bloom.logging import debug
 from bloom.logging import error
 from bloom.logging import info
@@ -61,6 +56,11 @@
     debug(traceback.format_exc())
     error("rosdep was not detected, please install it.", exit=True)
 
+if sys.version_info[0:2] < (3, 10):
+    from importlib_metadata import entry_points
+else:
+    from importlib.metadata import entry_points
+
 BLOOM_GROUP = 'bloom.generators'
 DEFAULT_ROS_DISTRO = 'indigo'