Fix imports

datumaro/cli/contexts/model.py

@@ -9,7 +9,7 @@
 import shutil
 
 from datumaro.components.project import Environment
-from datumaro.util.scope import scoped, on_error_do
+from datumaro.util.scope import on_error_do, scoped
 
 from ..util import CliException, MultilineFormatter, add_subparser
 from ..util.project import (

datumaro/cli/contexts/project/__init__.py

@@ -21,8 +21,8 @@
 from datumaro.components.project import PROJECT_DEFAULT_CONFIG as DEFAULT_CONFIG
 from datumaro.components.project import Environment, Project
 from datumaro.components.validator import TaskType
-from datumaro.util.scope import scoped, on_error_do
 from datumaro.util.os_util import make_file_name
+from datumaro.util.scope import on_error_do, scoped
 
 from ...util import CliException, MultilineFormatter, add_subparser
 from ...util.project import generate_next_file_name, load_project

datumaro/components/converter.py

@@ -12,8 +12,8 @@
 from datumaro.components.cli_plugin import CliPlugin
 from datumaro.components.dataset import DatasetPatch
 from datumaro.components.extractor import DatasetItem
-from datumaro.util.scope import scoped, on_error_do
 from datumaro.util.image import Image
+from datumaro.util.scope import on_error_do, scoped
 
 
 class Converter(CliPlugin):

datumaro/components/dataset.py

@@ -28,8 +28,8 @@
     ItemTransform, Transform,
 )
 from datumaro.util import is_method_redefined
-from datumaro.util.scope import scoped, on_error_do
 from datumaro.util.log_utils import logging_disabled
+from datumaro.util.scope import on_error_do, scoped
 
 DEFAULT_FORMAT = 'datumaro'
 

tests/test_util.py

@@ -5,7 +5,7 @@
 
 from datumaro.util import is_method_redefined
 from datumaro.util.os_util import walk
-from datumaro.util.scope import Scope, on_error_do, scoped, on_exit_do
+from datumaro.util.scope import Scope, on_error_do, on_exit_do, scoped
 from datumaro.util.test_utils import TestDir
 
 from .requirements import Requirements, mark_requirement