diff options
| author | Bastian Venthur <bastian.venthur@flixbus.com> | 2019-11-19 14:47:57 +0100 |
|---|---|---|
| committer | Bastian Venthur <bastian.venthur@flixbus.com> | 2020-06-03 17:37:47 +0200 |
| commit | e8424d5ae0de01fae98fa7aaff3c79cbb1dfcf2b (patch) | |
| tree | 126874728b31edded4b8d8220de150a8e2432738 /compose/config | |
| parent | eab3aab9be57d8fb3b66bb87c3559557708fb2fb (diff) | |
Removed Python2 support
Closes: #6890
Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>
Diffstat (limited to 'compose/config')
| -rw-r--r-- | compose/config/__init__.py | 3 | ||||
| -rw-r--r-- | compose/config/config.py | 3 | ||||
| -rw-r--r-- | compose/config/environment.py | 5 | ||||
| -rw-r--r-- | compose/config/errors.py | 2 | ||||
| -rw-r--r-- | compose/config/interpolation.py | 3 | ||||
| -rw-r--r-- | compose/config/serialize.py | 3 | ||||
| -rw-r--r-- | compose/config/sort_services.py | 3 | ||||
| -rw-r--r-- | compose/config/types.py | 3 | ||||
| -rw-r--r-- | compose/config/validation.py | 3 |
9 files changed, 2 insertions, 26 deletions
diff --git a/compose/config/__init__.py b/compose/config/__init__.py index 2b40666f..855b2401 100644 --- a/compose/config/__init__.py +++ b/compose/config/__init__.py @@ -1,7 +1,4 @@ # flake8: noqa -from __future__ import absolute_import -from __future__ import unicode_literals - from . import environment from .config import ConfigurationError from .config import DOCKER_CONFIG_KEYS diff --git a/compose/config/config.py b/compose/config/config.py index 444a4032..52863b13 100644 --- a/compose/config/config.py +++ b/compose/config/config.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import functools import io import logging diff --git a/compose/config/environment.py b/compose/config/environment.py index d8810ebb..abcafe0c 100644 --- a/compose/config/environment.py +++ b/compose/config/environment.py @@ -1,6 +1,5 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - +import codecs +import contextlib import logging import os import re diff --git a/compose/config/errors.py b/compose/config/errors.py index 9b2078f2..7db079e9 100644 --- a/compose/config/errors.py +++ b/compose/config/errors.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals VERSION_EXPLANATION = ( diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py index 18be8562..f202e911 100644 --- a/compose/config/interpolation.py +++ b/compose/config/interpolation.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import logging import re from string import Template diff --git a/compose/config/serialize.py b/compose/config/serialize.py index 5776ce95..79b5777c 100644 --- a/compose/config/serialize.py +++ b/compose/config/serialize.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import six import yaml diff --git a/compose/config/sort_services.py b/compose/config/sort_services.py index 42f548a6..a600139b 100644 --- a/compose/config/sort_services.py +++ b/compose/config/sort_services.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - from compose.config.errors import DependencyError diff --git a/compose/config/types.py b/compose/config/types.py index ab8f34e3..4a7a25b2 100644 --- a/compose/config/types.py +++ b/compose/config/types.py @@ -1,9 +1,6 @@ """ Types for objects parsed from the configuration. """ -from __future__ import absolute_import -from __future__ import unicode_literals - import json import ntpath import os diff --git a/compose/config/validation.py b/compose/config/validation.py index 1cceb71f..f8513bde 100644 --- a/compose/config/validation.py +++ b/compose/config/validation.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import json import logging import os |