Merge pull request #529 from joepvd/flexmock-update-0.11

Flexmock update 0.11

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__":

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.')

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
 

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

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

doozerlib/cli/cli_opts.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import yaml
 import io
 

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

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

doozerlib/coverity.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import hashlib

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

doozerlib/dotconfig.py

@@ -1,7 +1,6 @@
 # This file is part of dotconfig project <https://github.com/adammhaile/dotconfig>
 # and released under LGPL v3 <https://www.gnu.org/licenses/lgpl-3.0.en.html>
 
-from __future__ import absolute_import, print_function, unicode_literals
 from future.utils import string_types
 import yaml
 import os

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):

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

doozerlib/gitdata.py

@@ -1,7 +1,6 @@
 # This file is part of gitdata project <https://github.com/adammhaile/gitdata>
 # and released under LGPL v3 <https://www.gnu.org/licenses/lgpl-3.0.en.html>
 
-from __future__ import absolute_import, print_function, unicode_literals
 from future import standard_library
 standard_library.install_aliases()
 import yaml

doozerlib/image.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 
 import hashlib
 import json

doozerlib/logutil.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import logging
 
 

doozerlib/model.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 from future.utils import as_native_str
 
 

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

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

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

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()

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'

functional_tests/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import subprocess
 import os
 import tempfile

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

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

functional_tests/test_images.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 import os
 import pygit2

functional_tests/test_release.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 import io
 import os

functional_tests/test_rpms.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 import os
 import pygit2

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

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
 
 

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):

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

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

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

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
 

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
 

tests/test_distgit/test_generic_distgit.py

@@ -1,10 +1,9 @@
-from __future__ import absolute_import, print_function, unicode_literals
 
 import errno
 import os
 import unittest
 
-import flexmock
+from flexmock import flexmock
 import mock
 
 from doozerlib import distgit, model

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
 
@@ -7,7 +6,7 @@
 import unittest
 from threading import Lock
 
-import flexmock
+from flexmock import flexmock
 from mock import MagicMock
 
 from doozerlib import distgit, model

tests/test_distgit/test_image_distgit/test_push_image.py

@@ -1,11 +1,10 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import errno
 import os
 import sys
 import io
 import unittest
 
-import flexmock
+from flexmock import flexmock
 
 from doozerlib import distgit
 from doozerlib.assembly import AssemblyTypes

tests/test_distgit/test_pull_image.py

@@ -1,6 +1,5 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import unittest
-import flexmock
+from flexmock import flexmock
 from doozerlib import distgit
 
 

tests/test_distgit/test_recursive_overwrite.py

@@ -1,6 +1,5 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import unittest
-import flexmock
+from flexmock import flexmock
 from doozerlib import distgit
 
 

tests/test_distgit/test_rpm_distgit.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 
 import asyncio
 import unittest

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

tests/test_image.py

@@ -2,14 +2,13 @@
 """
 Test the ImageMetadata class
 """
-from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 import os
 import logging
 import tempfile
 import shutil
 import mock
-import flexmock
+from flexmock import flexmock
 try:
     from importlib import reload
 except ImportError:

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

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
 

tests/test_repo.py

@@ -2,13 +2,12 @@
 """
 Test the ImageMetadata class
 """
-from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 import os
 import logging
 import tempfile
 import shutil
-import flexmock
+from flexmock import flexmock
 try:
     from importlib import reload
 except ImportError:

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

tests/test_runtime.py

@@ -1,7 +1,6 @@
 #!/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
 
 

tests/test_source_modifications.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import pathlib

tests/test_util.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 
 from doozerlib import util