diff --git a/octodns/compat.py b/octodns/compat.py deleted file mode 100644 index 6586cff..0000000 --- a/octodns/compat.py +++ /dev/null @@ -1,10 +0,0 @@ -# -# Python 2/3 compat bits -# - -try: # pragma: no cover - from StringIO import StringIO -except ImportError: # pragma: no cover - from io import StringIO - -StringIO diff --git a/octodns/provider/plan.py b/octodns/provider/plan.py index 5b8be68..af6863a 100644 --- a/octodns/provider/plan.py +++ b/octodns/provider/plan.py @@ -8,8 +8,7 @@ from __future__ import absolute_import, division, print_function, \ from logging import DEBUG, ERROR, INFO, WARN, getLogger from sys import stdout -from six import text_type -from ..compat import StringIO +from six import StringIO, text_type class UnsafePlan(Exception): diff --git a/tests/test_octodns_plan.py b/tests/test_octodns_plan.py index a017431..9cf812d 100644 --- a/tests/test_octodns_plan.py +++ b/tests/test_octodns_plan.py @@ -6,10 +6,9 @@ from __future__ import absolute_import, division, print_function, \ unicode_literals from logging import getLogger -from six import text_type +from six import StringIO, text_type from unittest import TestCase -from octodns.compat import StringIO from octodns.provider.plan import Plan, PlanHtml, PlanLogger, PlanMarkdown from octodns.record import Create, Delete, Record, Update from octodns.zone import Zone diff --git a/tests/test_octodns_yaml.py b/tests/test_octodns_yaml.py index ddcd818..f211854 100644 --- a/tests/test_octodns_yaml.py +++ b/tests/test_octodns_yaml.py @@ -5,10 +5,10 @@ from __future__ import absolute_import, division, print_function, \ unicode_literals +from six import StringIO from unittest import TestCase from yaml.constructor import ConstructorError -from octodns.compat import StringIO from octodns.yaml import safe_dump, safe_load