Fixed new things that came after the PR

Signed-off-by: Bastian Venthur <[email protected]>

compose/cli/docker_client.py

@@ -2,7 +2,6 @@ import logging
 import os.path
 import ssl
 
-import six
 from docker import APIClient
 from docker import Context
 from docker import ContextAPI
@@ -44,7 +43,7 @@ def get_client(environment, verbose=False, version=None, context=None):
         environment=environment, tls_version=get_tls_version(environment)
     )
     if verbose:
-        version_info = six.iteritems(client.version())
+        version_info = client.version().items()
         log.info(get_version_info('full'))
         log.info("Docker base_url: %s", client.base_url)
         log.info("Docker version: %s",

script/release/const.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 
 

tests/acceptance/context_test.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 import shutil
 import unittest

tests/conftest.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import pytest
 
 import tests.acceptance.cli_test