Add future and metaclass boilerplate to test code.

Continue to ignore:

- test/integration/
- test/legacy/
- test/units/

test/runner/ansible-test

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
 """Legacy entry point for ansible-test. The preferred version is in the bin directory."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import lib.cli
 

test/runner/injector/python.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 """Provides an entry point for python scripts and python modules on the controller with the current python interpreter and optional code coverage collection."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import sys

test/runner/lib/__init__.py

@@ -1 +1,3 @@
 """Support code for Ansible testing infrastructure."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type

test/runner/lib/ansible_util.py

@@ -1,6 +1,6 @@
 """Miscellaneous utility functions and classes specific to ansible cli tools."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import json
 import os

test/runner/lib/cache.py

@@ -1,6 +1,6 @@
 """Cache for commonly shared data that is intended to be immutable."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 
 class CommonCache(object):

test/runner/lib/changes.py

@@ -1,6 +1,6 @@
 """Detect changes in Ansible code."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import re
 import os

test/runner/lib/classification.py

@@ -1,6 +1,6 @@
 """Classify changes in Ansible code."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import collections
 import os

test/runner/lib/cli.py

@@ -1,6 +1,6 @@
 """Test runner for all Ansible tests."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import errno
 import os

test/runner/lib/cloud/__init__.py

@@ -1,5 +1,6 @@
 """Plugin system for cloud providers and environments for use in integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import abc
 import atexit

test/runner/lib/cloud/acme.py

@@ -1,5 +1,6 @@
 """ACME plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import time

test/runner/lib/cloud/aws.py

@@ -1,5 +1,6 @@
 """AWS plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/cloud/azure.py

@@ -1,5 +1,6 @@
 """Azure plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/cloud/cloudscale.py

@@ -4,7 +4,8 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 """Cloudscale plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 from os.path import isfile
 

test/runner/lib/cloud/cs.py

@@ -1,5 +1,6 @@
 """CloudStack plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import json
 import os

test/runner/lib/cloud/foreman.py

@@ -1,6 +1,6 @@
 """Foreman plugin for integration tests."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import os
 

test/runner/lib/cloud/gcp.py

@@ -1,7 +1,8 @@
 # Copyright: (c) 2018, Google Inc.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """GCP plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/cloud/hcloud.py

@@ -1,5 +1,6 @@
 """Hetzner Cloud plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/cloud/nios.py

@@ -1,6 +1,6 @@
 """NIOS plugin for integration tests."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import os
 

test/runner/lib/cloud/opennebula.py

@@ -1,4 +1,6 @@
 """OpenNebula plugin for integration tests."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 from lib.cloud import (
     CloudProvider,

test/runner/lib/cloud/openshift.py

@@ -1,5 +1,6 @@
 """OpenShift plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import json
 import os

test/runner/lib/cloud/scaleway.py

@@ -1,5 +1,6 @@
 """Scaleway plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/cloud/tower.py

@@ -1,5 +1,6 @@
 """Tower plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import time

test/runner/lib/cloud/vcenter.py

@@ -1,5 +1,6 @@
 """VMware vCenter plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import time

test/runner/lib/cloud/vultr.py

@@ -1,5 +1,6 @@
 """Vultr plugin for integration tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/config.py

@@ -1,6 +1,6 @@
 """Configuration classes."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import os
 import sys

test/runner/lib/constants.py

@@ -1,4 +1,6 @@
 """Constants used by ansible-test. Imports should not be used in this file."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 # Setting a low soft RLIMIT_NOFILE value will improve the performance of subprocess.Popen on Python 2.x when close_fds=True.
 # This will affect all Python subprocesses. It will also affect the current Python process if set before subprocess is imported for the first time.

test/runner/lib/core_ci.py

@@ -1,6 +1,6 @@
 """Access Ansible Core CI remote services."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import json
 import os

test/runner/lib/cover.py

@@ -1,6 +1,6 @@
 """Code coverage utilities."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import os
 import re

test/runner/lib/csharp_import_analysis.py

@@ -1,6 +1,6 @@
 """Analyze C# import statements."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import os
 import re

test/runner/lib/delegation.py

@@ -1,6 +1,6 @@
 """Delegate test execution to another environment."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import os
 import re

test/runner/lib/diff.py

@@ -1,5 +1,6 @@
 """Diff parsing functions and classes."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import re
 import textwrap

test/runner/lib/docker_util.py

@@ -1,6 +1,6 @@
 """Functions for accessing docker via the docker cli."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import json
 import os

test/runner/lib/env.py

@@ -1,6 +1,6 @@
 """Show information about the test environment."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import datetime
 import json

test/runner/lib/executor.py

@@ -1,6 +1,6 @@
 """Execute Ansible tests."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import json
 import os

test/runner/lib/git.py

@@ -1,6 +1,6 @@
 """Wrapper around git command-line tools."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import lib.types as t
 

test/runner/lib/http.py

@@ -2,8 +2,8 @@
 Primitive replacement for requests to avoid extra dependency.
 Avoids use of urllib2 due to lack of SNI support.
 """
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import json
 import time

test/runner/lib/import_analysis.py

@@ -1,6 +1,6 @@
 """Analyze python import statements."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import ast
 import os

test/runner/lib/init.py

@@ -1,4 +1,6 @@
 """Early initialization for ansible-test before most other imports have been performed."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import resource
 

test/runner/lib/integration/__init__.py

@@ -1,6 +1,6 @@
 """Ansible integration test infrastructure."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import contextlib
 import json

test/runner/lib/manage_ci.py

@@ -1,6 +1,6 @@
 """Access Ansible Core CI remote services."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import os
 import tempfile

test/runner/lib/metadata.py

@@ -1,5 +1,6 @@
 """Test metadata for passing data to delegated tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import json
 

test/runner/lib/powershell_import_analysis.py

@@ -1,6 +1,6 @@
 """Analyze powershell import statements."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import os
 import re

test/runner/lib/pytar.py

@@ -1,6 +1,6 @@
 """Python native TGZ creation."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import abc
 import tarfile

test/runner/lib/sanity/__init__.py

@@ -1,5 +1,6 @@
 """Execute Ansible sanity tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import abc
 import glob

test/runner/lib/sanity/ansible_doc.py

@@ -1,5 +1,6 @@
 """Sanity test for ansible-doc."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import collections
 import os

test/runner/lib/sanity/compile.py

@@ -1,5 +1,6 @@
 """Sanity test for proper python syntax."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/sanity/import.py

@@ -1,5 +1,6 @@
 """Sanity test for proper import exception handling."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/sanity/integration_aliases.py

@@ -1,5 +1,6 @@
 """Sanity test to check integration test aliases."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import json
 import textwrap

test/runner/lib/sanity/pep8.py

@@ -1,5 +1,6 @@
 """Sanity test for PEP 8 style guidelines using pycodestyle."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/runner/lib/sanity/pslint.py

@@ -1,5 +1,6 @@
 """Sanity test using PSScriptAnalyzer."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import collections
 import json

test/runner/lib/sanity/pylint.py

@@ -1,5 +1,6 @@
 """Sanity test using pylint."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import collections
 import itertools

test/runner/lib/sanity/rstcheck.py

@@ -1,5 +1,6 @@
 """Sanity test using rstcheck."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/sanity/sanity_docs.py

@@ -1,5 +1,6 @@
 """Sanity test for documentation of sanity tests."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/sanity/shellcheck.py

@@ -1,5 +1,6 @@
 """Sanity test using shellcheck."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/runner/lib/sanity/validate_modules.py

@@ -1,5 +1,6 @@
 """Sanity test using validate-modules."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import collections
 import json

test/runner/lib/sanity/yamllint.py

@@ -1,5 +1,6 @@
 """Sanity test using yamllint."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import json
 import os

test/runner/lib/target.py

@@ -1,6 +1,6 @@
 """Test target identification, iteration and inclusion/exclusion."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import collections
 import os

test/runner/lib/test.py

@@ -1,6 +1,6 @@
 """Classes for storing and processing test results."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import datetime
 import json

test/runner/lib/thread.py

@@ -1,6 +1,6 @@
 """Python threading tools."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import threading
 import sys

test/runner/lib/util.py

@@ -1,6 +1,6 @@
 """Miscellaneous utility functions and classes."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import contextlib
 import errno

test/runner/lib/util_common.py

@@ -1,5 +1,6 @@
 """Common utility code that depends on CommonConfig."""
-from __future__ import absolute_import, print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import atexit
 import contextlib

test/runner/retry.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
 """Automatically retry failed commands."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 # noinspection PyCompatibility
 import argparse

test/runner/shippable.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
 """Verify the current Shippable run has the required number of jobs."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 # noinspection PyCompatibility
 import argparse

test/runner/units/test_diff.py

@@ -1,4 +1,7 @@
 """Tests for diff module."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import subprocess
 import pytest

test/runner/versions.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 """Show python and pip versions."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import sys

test/runner/yamlcheck.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 """Show python and pip versions."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import json
 

test/sanity/code-smell/action-plugin-docs.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 """Test to verify action plugins have an associated module to provide documentation."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import sys

test/sanity/code-smell/azure-requirements.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 """Make sure the Azure requirements files match."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import filecmp
 import os

test/sanity/code-smell/botmeta.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 """Make sure the data in BOTMETA.yml is valid"""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import glob
 import os

test/sanity/code-smell/changelog.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import sys

test/sanity/code-smell/configure-remoting-ps1.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/sanity/code-smell/docs-build.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/empty-init.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import sys

test/sanity/code-smell/future-import-boilerplate.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import sys
 
@@ -20,7 +22,9 @@ def main():
         'contrib/vault/',
         'docs/',
         'examples/',
-        'test/',
+        'test/integration/',
+        'test/legacy/',
+        'test/units/',
     )
 
     # These files pre-date the boilerplate test and should be fixed up as time goes on

test/sanity/code-smell/line-endings.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import sys
 

test/sanity/code-smell/metaclass-boilerplate.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import sys
 
@@ -18,7 +20,9 @@ def main():
         'contrib/vault/',
         'docs/',
         'examples/',
-        'test/'
+        'test/integration/',
+        'test/legacy/',
+        'test/units/',
     )
 
     grandfathered = frozenset((

test/sanity/code-smell/no-assert.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-basestring.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-dict-iteritems.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-dict-iterkeys.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-dict-itervalues.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-get-exception.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-illegal-filenames.py

@@ -3,6 +3,8 @@
 # a script to check for illegal filenames on various Operating Systems. The
 # main rules are derived from restrictions on Windows
 # https://msdn.microsoft.com/en-us/library/aa365247#naming_conventions
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-main-display.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-smart-quotes.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-unicode-literals.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/no-unwanted-files.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 """Prevent unwanted files from being added to the source tree."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import sys
 

test/sanity/code-smell/replace-urlopen.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/required-and-default-attributes.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/code-smell/shebang.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import stat

test/sanity/code-smell/symlinks.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 

test/sanity/code-smell/test-constraints.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import re
 import sys

test/sanity/code-smell/use-argspec-type-path.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import re
 import sys

test/sanity/code-smell/use-compat-six.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import re

test/sanity/compile/compile.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 """Python syntax checker with lint friendly output."""
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import parser
 import sys

test/sanity/import/importer.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Import the given python module(s) and report error(s) encountered."""
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import absolute_import, print_function
+__metaclass__ = type
 
 import contextlib
 import os

test/sanity/validate-modules/__init__.py

@@ -15,5 +15,6 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 __version__ = '0.0.1b'

test/sanity/validate-modules/main.py

@@ -16,8 +16,8 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+from __future__ import (absolute_import, division, print_function)
-from __future__ import print_function
+__metaclass__ = type
 
 import abc
 import argparse

test/sanity/validate-modules/module_args.py

@@ -15,6 +15,8 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import imp
 import json

test/sanity/validate-modules/schema.py

@@ -3,6 +3,8 @@
 # Copyright: (c) 2015, Matt Martz <matt@sivel.net>
 # Copyright: (c) 2015, Rackspace US, Inc.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import re
 from voluptuous import ALLOW_EXTRA, PREVENT_EXTRA, All, Any, Length, Invalid, Required, Schema, Self