diff --git a/pre_commit/commands/autoupdate.py b/pre_commit/commands/autoupdate.py index 5614a1cd..27b8d98d 100644 --- a/pre_commit/commands/autoupdate.py +++ b/pre_commit/commands/autoupdate.py @@ -1,6 +1,8 @@ from __future__ import print_function from __future__ import unicode_literals +from collections import OrderedDict + from aspy.yaml import ordered_dump from aspy.yaml import ordered_load @@ -10,7 +12,6 @@ from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA from pre_commit.clientlib.validate_config import is_local_hooks from pre_commit.clientlib.validate_config import load_config from pre_commit.jsonschema_extensions import remove_defaults -from pre_commit.ordereddict import OrderedDict from pre_commit.repository import Repository from pre_commit.util import CalledProcessError from pre_commit.util import cmd_output diff --git a/pre_commit/ordereddict.py b/pre_commit/ordereddict.py deleted file mode 100644 index 2844cb46..00000000 --- a/pre_commit/ordereddict.py +++ /dev/null @@ -1,7 +0,0 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - -try: - from collections import OrderedDict # noqa -except ImportError: # pragma: no cover (PY26) - from ordereddict import OrderedDict # noqa diff --git a/testing/fixtures.py b/testing/fixtures.py index 4da32eb0..aaa4203d 100644 --- a/testing/fixtures.py +++ b/testing/fixtures.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import contextlib import io import os.path +from collections import OrderedDict from aspy.yaml import ordered_dump from aspy.yaml import ordered_load @@ -13,7 +14,6 @@ from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA from pre_commit.clientlib.validate_config import validate_config_extra from pre_commit.clientlib.validate_manifest import load_manifest from pre_commit.jsonschema_extensions import apply_defaults -from pre_commit.ordereddict import OrderedDict from pre_commit.util import cmd_output from pre_commit.util import cwd from testing.util import copy_tree_to_path diff --git a/tests/clientlib/validate_base_test.py b/tests/clientlib/validate_base_test.py index 5c44ab51..7cbcada2 100644 --- a/tests/clientlib/validate_base_test.py +++ b/tests/clientlib/validate_base_test.py @@ -1,10 +1,11 @@ from __future__ import unicode_literals +from collections import OrderedDict + import pytest from aspy.yaml import ordered_load from pre_commit.clientlib.validate_base import get_validator -from pre_commit.ordereddict import OrderedDict from testing.util import get_resource_path diff --git a/tests/commands/autoupdate_test.py b/tests/commands/autoupdate_test.py index 29e617d9..29bc087b 100644 --- a/tests/commands/autoupdate_test.py +++ b/tests/commands/autoupdate_test.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals import shutil +from collections import OrderedDict import pytest @@ -9,7 +10,6 @@ from pre_commit.clientlib.validate_config import load_config from pre_commit.commands.autoupdate import _update_repo from pre_commit.commands.autoupdate import autoupdate from pre_commit.commands.autoupdate import RepositoryCannotBeUpdatedError -from pre_commit.ordereddict import OrderedDict from pre_commit.runner import Runner from pre_commit.util import cmd_output from pre_commit.util import cwd diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py index a24ffbdd..056ec8f6 100644 --- a/tests/commands/run_test.py +++ b/tests/commands/run_test.py @@ -5,6 +5,7 @@ import io import os.path import subprocess import sys +from collections import OrderedDict import mock import pytest @@ -16,7 +17,6 @@ from pre_commit.commands.run import _get_skips from pre_commit.commands.run import _has_unmerged_paths from pre_commit.commands.run import get_changed_files from pre_commit.commands.run import run -from pre_commit.ordereddict import OrderedDict from pre_commit.runner import Runner from pre_commit.util import cmd_output from pre_commit.util import cwd diff --git a/tests/runner_test.py b/tests/runner_test.py index 9039e573..a4f8cb7c 100644 --- a/tests/runner_test.py +++ b/tests/runner_test.py @@ -2,9 +2,9 @@ from __future__ import absolute_import from __future__ import unicode_literals import os.path +from collections import OrderedDict import pre_commit.constants as C -from pre_commit.ordereddict import OrderedDict from pre_commit.runner import Runner from pre_commit.util import cmd_output from pre_commit.util import cwd