From 69e613eb008ce765779c0d8109708cc4ca80ee27 Mon Sep 17 00:00:00 2001 From: Joep van Delft Date: Mon, 8 Nov 2021 20:59:02 +0100 Subject: [PATCH 1/2] Update code to work with flexmock 0.11 Flexmock 0.11 got released over the weekend, with a breaking [change](https://flexmock.readthedocs.io/en/latest/changelog/#release-0110) regarding import paths. This commit allows flexmock 0.11 to be used without losing compatibility with 0.10. --- tests/test_distgit/test_generic_distgit.py | 2 +- tests/test_distgit/test_image_distgit/test_image_distgit.py | 2 +- tests/test_distgit/test_image_distgit/test_push_image.py | 2 +- tests/test_distgit/test_pull_image.py | 2 +- tests/test_distgit/test_recursive_overwrite.py | 2 +- tests/test_image.py | 2 +- tests/test_olm_bundle.py | 2 +- tests/test_repo.py | 2 +- tests/test_runtime.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test_distgit/test_generic_distgit.py b/tests/test_distgit/test_generic_distgit.py index e06d445f2..1412b0fef 100644 --- a/tests/test_distgit/test_generic_distgit.py +++ b/tests/test_distgit/test_generic_distgit.py @@ -4,7 +4,7 @@ import os import unittest -import flexmock +from flexmock import flexmock import mock from doozerlib import distgit, model diff --git a/tests/test_distgit/test_image_distgit/test_image_distgit.py b/tests/test_distgit/test_image_distgit/test_image_distgit.py index c3d080022..fabd68854 100644 --- a/tests/test_distgit/test_image_distgit/test_image_distgit.py +++ b/tests/test_distgit/test_image_distgit/test_image_distgit.py @@ -7,7 +7,7 @@ import unittest from threading import Lock -import flexmock +from flexmock import flexmock from mock import MagicMock from doozerlib import distgit, model diff --git a/tests/test_distgit/test_image_distgit/test_push_image.py b/tests/test_distgit/test_image_distgit/test_push_image.py index 85798f116..fe8efe68a 100644 --- a/tests/test_distgit/test_image_distgit/test_push_image.py +++ b/tests/test_distgit/test_image_distgit/test_push_image.py @@ -5,7 +5,7 @@ import io import unittest -import flexmock +from flexmock import flexmock from doozerlib import distgit from doozerlib.assembly import AssemblyTypes diff --git a/tests/test_distgit/test_pull_image.py b/tests/test_distgit/test_pull_image.py index 9298ef953..6e324e435 100644 --- a/tests/test_distgit/test_pull_image.py +++ b/tests/test_distgit/test_pull_image.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, print_function, unicode_literals import unittest -import flexmock +from flexmock import flexmock from doozerlib import distgit diff --git a/tests/test_distgit/test_recursive_overwrite.py b/tests/test_distgit/test_recursive_overwrite.py index 57bf11326..86e8fa1cc 100644 --- a/tests/test_distgit/test_recursive_overwrite.py +++ b/tests/test_distgit/test_recursive_overwrite.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, print_function, unicode_literals import unittest -import flexmock +from flexmock import flexmock from doozerlib import distgit diff --git a/tests/test_image.py b/tests/test_image.py index 51a782d0d..6c2f8e551 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -9,7 +9,7 @@ import tempfile import shutil import mock -import flexmock +from flexmock import flexmock try: from importlib import reload except ImportError: diff --git a/tests/test_olm_bundle.py b/tests/test_olm_bundle.py index 682599a3f..468161df1 100644 --- a/tests/test_olm_bundle.py +++ b/tests/test_olm_bundle.py @@ -1,6 +1,6 @@ import unittest -import flexmock +from flexmock import flexmock from mock import MagicMock from doozerlib.olm.bundle import OLMBundle diff --git a/tests/test_repo.py b/tests/test_repo.py index 0235f5508..182c98591 100644 --- a/tests/test_repo.py +++ b/tests/test_repo.py @@ -8,7 +8,7 @@ import logging import tempfile import shutil -import flexmock +from flexmock import flexmock try: from importlib import reload except ImportError: diff --git a/tests/test_runtime.py b/tests/test_runtime.py index 7f5ba034a..2619cc451 100644 --- a/tests/test_runtime.py +++ b/tests/test_runtime.py @@ -1,7 +1,7 @@ #!/usr/bin/env python from __future__ import absolute_import, print_function, unicode_literals import unittest -import flexmock +from flexmock import flexmock from doozerlib import runtime, exectools, logutil, model From b3cc4c32ea06092a74a7c276986472f020e56d24 Mon Sep 17 00:00:00 2001 From: Joep van Delft Date: Mon, 8 Nov 2021 21:03:32 +0100 Subject: [PATCH 2/2] We are in the future --- doozer | 1 - doozerlib/__init__.py | 1 - doozerlib/assertion.py | 1 - doozerlib/brew.py | 1 - doozerlib/cli/__main__.py | 1 - doozerlib/cli/cli_opts.py | 1 - doozerlib/config.py | 1 - doozerlib/constants.py | 1 - doozerlib/coverity.py | 1 - doozerlib/dblib.py | 1 - doozerlib/dotconfig.py | 1 - doozerlib/exceptions.py | 1 - doozerlib/exectools.py | 1 - doozerlib/gitdata.py | 1 - doozerlib/image.py | 1 - doozerlib/logutil.py | 1 - doozerlib/model.py | 1 - doozerlib/pushd.py | 1 - doozerlib/repos.py | 1 - doozerlib/rhcos.py | 1 - doozerlib/runtime.py | 1 - doozerlib/state.py | 1 - functional_tests/__init__.py | 1 - functional_tests/test_cleanup.py | 1 - functional_tests/test_config.py | 1 - functional_tests/test_images.py | 1 - functional_tests/test_release.py | 1 - functional_tests/test_rpms.py | 1 - rundoozer/rundoozer | 1 - rundoozer/setup.py | 1 - setup.py | 1 - tests/test_assertion.py | 1 - tests/test_brew_inspector.py | 1 - tests/test_distgit/support.py | 1 - tests/test_distgit/test_build_image_ref_name.py | 1 - tests/test_distgit/test_convert_source_url_to_https.py | 1 - tests/test_distgit/test_generic_distgit.py | 1 - tests/test_distgit/test_image_distgit/test_image_distgit.py | 1 - tests/test_distgit/test_image_distgit/test_push_image.py | 1 - tests/test_distgit/test_pull_image.py | 1 - tests/test_distgit/test_recursive_overwrite.py | 1 - tests/test_distgit/test_rpm_distgit.py | 1 - tests/test_exectools.py | 1 - tests/test_image.py | 1 - tests/test_pushd.py | 1 - tests/test_repo.py | 1 - tests/test_rhcos.py | 1 - tests/test_runtime.py | 1 - tests/test_source_modifications.py | 1 - tests/test_util.py | 1 - 50 files changed, 50 deletions(-) diff --git a/doozer b/doozer index ca6343639..bc37a72b5 100755 --- a/doozer +++ b/doozer @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -from __future__ import absolute_import, print_function, unicode_literals from doozerlib.cli.__main__ import main if __name__ == "__main__": diff --git a/doozerlib/__init__.py b/doozerlib/__init__.py index 89e6b7d56..88d99c0a7 100644 --- a/doozerlib/__init__.py +++ b/doozerlib/__init__.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import sys if sys.version_info < (3, 6): sys.exit('Sorry, Python < 3.6 is not supported.') diff --git a/doozerlib/assertion.py b/doozerlib/assertion.py index 944ab6688..b7e6a7076 100644 --- a/doozerlib/assertion.py +++ b/doozerlib/assertion.py @@ -5,7 +5,6 @@ The use of the FileNotFound exception makes this Python3 ready. Making them functions keeps the exception definition localized. """ -from __future__ import absolute_import, print_function, unicode_literals import os import errno diff --git a/doozerlib/brew.py b/doozerlib/brew.py index b99e24a00..44f732e59 100644 --- a/doozerlib/brew.py +++ b/doozerlib/brew.py @@ -1,7 +1,6 @@ """ Utility functions for general interactions with Brew and Builds """ -from __future__ import absolute_import, print_function, unicode_literals # stdlib import json diff --git a/doozerlib/cli/__main__.py b/doozerlib/cli/__main__.py index 7d1c273e0..b94f24b16 100644 --- a/doozerlib/cli/__main__.py +++ b/doozerlib/cli/__main__.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, print_function, unicode_literals import click import os import shutil diff --git a/doozerlib/cli/cli_opts.py b/doozerlib/cli/cli_opts.py index 02f804811..3456e5dfa 100644 --- a/doozerlib/cli/cli_opts.py +++ b/doozerlib/cli/cli_opts.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import yaml import io diff --git a/doozerlib/config.py b/doozerlib/config.py index cd83a0ed5..32e7e225e 100644 --- a/doozerlib/config.py +++ b/doozerlib/config.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals from future.utils import bytes_to_native_str from . import metadata import yaml diff --git a/doozerlib/constants.py b/doozerlib/constants.py index d39c4e6a0..5eb54e00a 100644 --- a/doozerlib/constants.py +++ b/doozerlib/constants.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals # Environment variables to disable Git stdin prompts for username, password, etc diff --git a/doozerlib/coverity.py b/doozerlib/coverity.py index c0cffcd76..8382593f6 100644 --- a/doozerlib/coverity.py +++ b/doozerlib/coverity.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import os import hashlib diff --git a/doozerlib/dblib.py b/doozerlib/dblib.py index 65d675d3c..a3b18695a 100644 --- a/doozerlib/dblib.py +++ b/doozerlib/dblib.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals from future.utils import as_native_str import time import os diff --git a/doozerlib/dotconfig.py b/doozerlib/dotconfig.py index 1be64c5d7..6eb334ec7 100644 --- a/doozerlib/dotconfig.py +++ b/doozerlib/dotconfig.py @@ -1,7 +1,6 @@ # This file is part of dotconfig project # and released under LGPL v3 -from __future__ import absolute_import, print_function, unicode_literals from future.utils import string_types import yaml import os diff --git a/doozerlib/exceptions.py b/doozerlib/exceptions.py index b90cc54c5..4ffbeb6d5 100644 --- a/doozerlib/exceptions.py +++ b/doozerlib/exceptions.py @@ -1,7 +1,6 @@ """Common tooling exceptions. Store them in this central place to avoid circular imports """ -from __future__ import absolute_import, print_function, unicode_literals class DoozerFatalError(Exception): diff --git a/doozerlib/exectools.py b/doozerlib/exectools.py index efd997c48..0667861f6 100644 --- a/doozerlib/exectools.py +++ b/doozerlib/exectools.py @@ -4,7 +4,6 @@ ordinary subprocess behaviors. """ -from __future__ import absolute_import, print_function, unicode_literals import asyncio from asyncio import events import contextvars diff --git a/doozerlib/gitdata.py b/doozerlib/gitdata.py index 2db308464..97eac117b 100644 --- a/doozerlib/gitdata.py +++ b/doozerlib/gitdata.py @@ -1,7 +1,6 @@ # This file is part of gitdata project # and released under LGPL v3 -from __future__ import absolute_import, print_function, unicode_literals from future import standard_library standard_library.install_aliases() import yaml diff --git a/doozerlib/image.py b/doozerlib/image.py index f14996157..4cc53b879 100644 --- a/doozerlib/image.py +++ b/doozerlib/image.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import hashlib import json diff --git a/doozerlib/logutil.py b/doozerlib/logutil.py index bbbce4d62..c2821abaa 100644 --- a/doozerlib/logutil.py +++ b/doozerlib/logutil.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import logging diff --git a/doozerlib/model.py b/doozerlib/model.py index d5ab93f7a..18f23d4bb 100644 --- a/doozerlib/model.py +++ b/doozerlib/model.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals from future.utils import as_native_str diff --git a/doozerlib/pushd.py b/doozerlib/pushd.py index 9a624f4e9..22d2aeb1b 100644 --- a/doozerlib/pushd.py +++ b/doozerlib/pushd.py @@ -7,7 +7,6 @@ in a working directory other than the CWD and return without needing to explicitly handle it. """ -from __future__ import absolute_import, print_function, unicode_literals import threading import pathlib diff --git a/doozerlib/repos.py b/doozerlib/repos.py index 134653e8e..7c32fe166 100644 --- a/doozerlib/repos.py +++ b/doozerlib/repos.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals from .model import Model, ModelException, Missing import yaml import requests diff --git a/doozerlib/rhcos.py b/doozerlib/rhcos.py index c6c88a993..04918944d 100644 --- a/doozerlib/rhcos.py +++ b/doozerlib/rhcos.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import json from typing import Dict, List, Tuple, Optional diff --git a/doozerlib/runtime.py b/doozerlib/runtime.py index 91b949bb2..7d8c06797 100644 --- a/doozerlib/runtime.py +++ b/doozerlib/runtime.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals from multiprocessing.pool import MapResult from future import standard_library standard_library.install_aliases() diff --git a/doozerlib/state.py b/doozerlib/state.py index 3849115d3..d3c4e542f 100644 --- a/doozerlib/state.py +++ b/doozerlib/state.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals STATE_PEND = 'pending' STATE_PASS = 'passed' STATE_FAIL = 'failed' diff --git a/functional_tests/__init__.py b/functional_tests/__init__.py index a820a678b..bea9e8e59 100644 --- a/functional_tests/__init__.py +++ b/functional_tests/__init__.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import subprocess import os import tempfile diff --git a/functional_tests/test_cleanup.py b/functional_tests/test_cleanup.py index fbddf30c5..f94ca6d0e 100644 --- a/functional_tests/test_cleanup.py +++ b/functional_tests/test_cleanup.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest from . import run_doozer, get_working_dir import os diff --git a/functional_tests/test_config.py b/functional_tests/test_config.py index 3d2d07b17..f8c8954ea 100644 --- a/functional_tests/test_config.py +++ b/functional_tests/test_config.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest import yaml from . import run_doozer, get_working_dir diff --git a/functional_tests/test_images.py b/functional_tests/test_images.py index 3b653617c..d021c20b7 100644 --- a/functional_tests/test_images.py +++ b/functional_tests/test_images.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest import os import pygit2 diff --git a/functional_tests/test_release.py b/functional_tests/test_release.py index 6f26ad66b..8c8d481c3 100644 --- a/functional_tests/test_release.py +++ b/functional_tests/test_release.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest import io import os diff --git a/functional_tests/test_rpms.py b/functional_tests/test_rpms.py index 5ea6a6b48..50706c74f 100644 --- a/functional_tests/test_rpms.py +++ b/functional_tests/test_rpms.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest import os import pygit2 diff --git a/rundoozer/rundoozer b/rundoozer/rundoozer index 957f77a55..ecb4b6143 100755 --- a/rundoozer/rundoozer +++ b/rundoozer/rundoozer @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import absolute_import, print_function, unicode_literals import os import shutil import tempfile diff --git a/rundoozer/setup.py b/rundoozer/setup.py index 9d08f3040..c04f002d9 100644 --- a/rundoozer/setup.py +++ b/rundoozer/setup.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import absolute_import, print_function, unicode_literals from setuptools import setup diff --git a/setup.py b/setup.py index 6235e8a5a..e50db02ba 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, print_function, unicode_literals from setuptools import setup, find_packages import sys if sys.version_info < (3, 6): diff --git a/tests/test_assertion.py b/tests/test_assertion.py index 283fbec59..eb7b55b53 100644 --- a/tests/test_assertion.py +++ b/tests/test_assertion.py @@ -1,7 +1,6 @@ """ Test the task related functions for the OpenShift Image/RPM Build Tool """ -from __future__ import absolute_import, print_function, unicode_literals import unittest from doozerlib import assertion diff --git a/tests/test_brew_inspector.py b/tests/test_brew_inspector.py index bb3dba674..d29a97868 100644 --- a/tests/test_brew_inspector.py +++ b/tests/test_brew_inspector.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import, print_function, unicode_literals from pathlib import Path import os diff --git a/tests/test_distgit/support.py b/tests/test_distgit/support.py index 5d88ce355..b64097874 100644 --- a/tests/test_distgit/support.py +++ b/tests/test_distgit/support.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals from future import standard_library from doozerlib.assembly import AssemblyTypes diff --git a/tests/test_distgit/test_build_image_ref_name.py b/tests/test_distgit/test_build_image_ref_name.py index 8328eade9..282453b0a 100644 --- a/tests/test_distgit/test_build_image_ref_name.py +++ b/tests/test_distgit/test_build_image_ref_name.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest from doozerlib import distgit diff --git a/tests/test_distgit/test_convert_source_url_to_https.py b/tests/test_distgit/test_convert_source_url_to_https.py index 3b7cf45d0..1fe6d3647 100644 --- a/tests/test_distgit/test_convert_source_url_to_https.py +++ b/tests/test_distgit/test_convert_source_url_to_https.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest from doozerlib import util diff --git a/tests/test_distgit/test_generic_distgit.py b/tests/test_distgit/test_generic_distgit.py index 1412b0fef..53b11ca2c 100644 --- a/tests/test_distgit/test_generic_distgit.py +++ b/tests/test_distgit/test_generic_distgit.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import errno import os diff --git a/tests/test_distgit/test_image_distgit/test_image_distgit.py b/tests/test_distgit/test_image_distgit/test_image_distgit.py index fabd68854..352b609a6 100644 --- a/tests/test_distgit/test_image_distgit/test_image_distgit.py +++ b/tests/test_distgit/test_image_distgit/test_image_distgit.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import io import logging diff --git a/tests/test_distgit/test_image_distgit/test_push_image.py b/tests/test_distgit/test_image_distgit/test_push_image.py index fe8efe68a..cb0857595 100644 --- a/tests/test_distgit/test_image_distgit/test_push_image.py +++ b/tests/test_distgit/test_image_distgit/test_push_image.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import errno import os import sys diff --git a/tests/test_distgit/test_pull_image.py b/tests/test_distgit/test_pull_image.py index 6e324e435..3df02687c 100644 --- a/tests/test_distgit/test_pull_image.py +++ b/tests/test_distgit/test_pull_image.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest from flexmock import flexmock from doozerlib import distgit diff --git a/tests/test_distgit/test_recursive_overwrite.py b/tests/test_distgit/test_recursive_overwrite.py index 86e8fa1cc..0488aea8e 100644 --- a/tests/test_distgit/test_recursive_overwrite.py +++ b/tests/test_distgit/test_recursive_overwrite.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest from flexmock import flexmock from doozerlib import distgit diff --git a/tests/test_distgit/test_rpm_distgit.py b/tests/test_distgit/test_rpm_distgit.py index aaedb23b6..16e2dde2e 100644 --- a/tests/test_distgit/test_rpm_distgit.py +++ b/tests/test_distgit/test_rpm_distgit.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import asyncio import unittest diff --git a/tests/test_exectools.py b/tests/test_exectools.py index 5b17719da..2acbd6f00 100644 --- a/tests/test_exectools.py +++ b/tests/test_exectools.py @@ -3,7 +3,6 @@ Test functions related to controlled command execution """ -from __future__ import absolute_import, print_function, unicode_literals import asyncio import unittest diff --git a/tests/test_image.py b/tests/test_image.py index 6c2f8e551..02d4593d5 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -2,7 +2,6 @@ """ Test the ImageMetadata class """ -from __future__ import absolute_import, print_function, unicode_literals import unittest import os import logging diff --git a/tests/test_pushd.py b/tests/test_pushd.py index 378ddd976..7ec5d10ad 100644 --- a/tests/test_pushd.py +++ b/tests/test_pushd.py @@ -1,7 +1,6 @@ """ Test the Dir() class. Verify that it works as a context_manager. """ -from __future__ import absolute_import, print_function, unicode_literals import unittest diff --git a/tests/test_repo.py b/tests/test_repo.py index 182c98591..b6b0ba106 100644 --- a/tests/test_repo.py +++ b/tests/test_repo.py @@ -2,7 +2,6 @@ """ Test the ImageMetadata class """ -from __future__ import absolute_import, print_function, unicode_literals import unittest import os import logging diff --git a/tests/test_rhcos.py b/tests/test_rhcos.py index c13b78b55..4c2ece5d4 100755 --- a/tests/test_rhcos.py +++ b/tests/test_rhcos.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import absolute_import, print_function, unicode_literals import logging import json diff --git a/tests/test_runtime.py b/tests/test_runtime.py index 2619cc451..13f863d15 100644 --- a/tests/test_runtime.py +++ b/tests/test_runtime.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import, print_function, unicode_literals import unittest from flexmock import flexmock from doozerlib import runtime, exectools, logutil, model diff --git a/tests/test_source_modifications.py b/tests/test_source_modifications.py index 8a94edd8e..2e1a9fab8 100644 --- a/tests/test_source_modifications.py +++ b/tests/test_source_modifications.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import os import pathlib diff --git a/tests/test_util.py b/tests/test_util.py index 81eb135e8..7184e0d3c 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals import unittest from doozerlib import util