diff --git a/poetry/factory.py b/poetry/factory.py index 144bfe35871..03b55175cd4 100644 --- a/poetry/factory.py +++ b/poetry/factory.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - from pathlib import Path from typing import TYPE_CHECKING from typing import Dict @@ -10,17 +7,16 @@ from cleo.io.io import IO from cleo.io.null_io import NullIO +from poetry.config.config import Config +from poetry.config.file_config_source import FileConfigSource from poetry.core.factory import Factory as BaseFactory from poetry.core.toml.file import TOMLFile - -from .config.config import Config -from .config.file_config_source import FileConfigSource -from .locations import CONFIG_DIR -from .packages.locker import Locker -from .packages.project_package import ProjectPackage -from .plugins.plugin_manager import PluginManager -from .poetry import Poetry -from .repositories.pypi_repository import PyPiRepository +from poetry.locations import CONFIG_DIR +from poetry.packages.locker import Locker +from poetry.packages.project_package import ProjectPackage +from poetry.plugins.plugin_manager import PluginManager +from poetry.poetry import Poetry +from poetry.repositories.pypi_repository import PyPiRepository if TYPE_CHECKING: diff --git a/poetry/masonry/builders/editable.py b/poetry/masonry/builders/editable.py index 52d42b8dab5..60c686844e6 100644 --- a/poetry/masonry/builders/editable.py +++ b/poetry/masonry/builders/editable.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import hashlib import os import shutil diff --git a/tests/console/commands/test_export.py b/tests/console/commands/test_export.py index 0c4efc2e45e..80b2f14f732 100644 --- a/tests/console/commands/test_export.py +++ b/tests/console/commands/test_export.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import pytest from tests.helpers import get_package diff --git a/tests/fixtures/directory/project_with_transitive_directory_dependencies/setup.py b/tests/fixtures/directory/project_with_transitive_directory_dependencies/setup.py index 24a8f05be9f..cfce0806c30 100644 --- a/tests/fixtures/directory/project_with_transitive_directory_dependencies/setup.py +++ b/tests/fixtures/directory/project_with_transitive_directory_dependencies/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from distutils.core import setup packages = ["project_with_extras"] diff --git a/tests/fixtures/git/github.com/demo/demo/setup.py b/tests/fixtures/git/github.com/demo/demo/setup.py index faebbc83748..b6f6d0c1f8c 100644 --- a/tests/fixtures/git/github.com/demo/demo/setup.py +++ b/tests/fixtures/git/github.com/demo/demo/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from setuptools import setup diff --git a/tests/fixtures/git/github.com/demo/no-dependencies/setup.py b/tests/fixtures/git/github.com/demo/no-dependencies/setup.py index da86b53b2bb..099c69cf976 100644 --- a/tests/fixtures/git/github.com/demo/no-dependencies/setup.py +++ b/tests/fixtures/git/github.com/demo/no-dependencies/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from setuptools import setup diff --git a/tests/fixtures/git/github.com/demo/no-version/setup.py b/tests/fixtures/git/github.com/demo/no-version/setup.py index 4e1aea3034c..d14b308cb23 100644 --- a/tests/fixtures/git/github.com/demo/no-version/setup.py +++ b/tests/fixtures/git/github.com/demo/no-version/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import ast import os diff --git a/tests/fixtures/git/github.com/demo/non-canonical-name/setup.py b/tests/fixtures/git/github.com/demo/non-canonical-name/setup.py index 3e6da62e986..8004332d6d9 100644 --- a/tests/fixtures/git/github.com/demo/non-canonical-name/setup.py +++ b/tests/fixtures/git/github.com/demo/non-canonical-name/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from setuptools import setup diff --git a/tests/fixtures/project_with_setup/setup.py b/tests/fixtures/project_with_setup/setup.py index 0f9e0d095a0..c329347f9bb 100644 --- a/tests/fixtures/project_with_setup/setup.py +++ b/tests/fixtures/project_with_setup/setup.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from setuptools import setup diff --git a/tests/installation/test_executor.py b/tests/installation/test_executor.py index 9b7b413b92b..de3945661fd 100644 --- a/tests/installation/test_executor.py +++ b/tests/installation/test_executor.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import json import re import shutil diff --git a/tests/installation/test_installer.py b/tests/installation/test_installer.py index b368488e27f..7625f07df2f 100644 --- a/tests/installation/test_installer.py +++ b/tests/installation/test_installer.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import itertools import json diff --git a/tests/installation/test_installer_old.py b/tests/installation/test_installer_old.py index 7cb8a4fa98b..c4a41c34ad5 100644 --- a/tests/installation/test_installer_old.py +++ b/tests/installation/test_installer_old.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import itertools from pathlib import Path diff --git a/tests/masonry/builders/test_editable_builder.py b/tests/masonry/builders/test_editable_builder.py index 270b1d80c75..4cc2c6c8c6a 100644 --- a/tests/masonry/builders/test_editable_builder.py +++ b/tests/masonry/builders/test_editable_builder.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import os import shutil diff --git a/tests/test_factory.py b/tests/test_factory.py index 072f7ebb01a..bb632cc9a26 100644 --- a/tests/test_factory.py +++ b/tests/test_factory.py @@ -1,7 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import unicode_literals - from pathlib import Path import pytest diff --git a/tests/utils/fixtures/setups/ansible/setup.py b/tests/utils/fixtures/setups/ansible/setup.py index 5d7d1f4ec60..7a3af3bf995 100644 --- a/tests/utils/fixtures/setups/ansible/setup.py +++ b/tests/utils/fixtures/setups/ansible/setup.py @@ -1,5 +1,3 @@ -from __future__ import print_function - import json import os import os.path diff --git a/tests/utils/fixtures/setups/flask/setup.py b/tests/utils/fixtures/setups/flask/setup.py index 2117d7ccc0a..98801eb8dff 100644 --- a/tests/utils/fixtures/setups/flask/setup.py +++ b/tests/utils/fixtures/setups/flask/setup.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- import io import re from collections import OrderedDict diff --git a/tests/utils/fixtures/setups/pendulum/setup.py b/tests/utils/fixtures/setups/pendulum/setup.py index 3a6323fbbdf..4dcbe961465 100644 --- a/tests/utils/fixtures/setups/pendulum/setup.py +++ b/tests/utils/fixtures/setups/pendulum/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from distutils.core import setup from build import *