From 9e4c120c3e8d6bfe89fed811ed0a23518ef83ac0 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Mon, 29 Jul 2019 08:43:58 -0700 Subject: [PATCH] StringIO compat --- octodns/compat.py | 10 ++++++++++ octodns/provider/plan.py | 2 +- tests/test_octodns_plan.py | 2 +- tests/test_octodns_yaml.py | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 octodns/compat.py diff --git a/octodns/compat.py b/octodns/compat.py new file mode 100644 index 0000000..6586cff --- /dev/null +++ b/octodns/compat.py @@ -0,0 +1,10 @@ +# +# 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 9eb7675..d4589f2 100644 --- a/octodns/provider/plan.py +++ b/octodns/provider/plan.py @@ -5,11 +5,11 @@ from __future__ import absolute_import, division, print_function, \ unicode_literals -from StringIO import StringIO from logging import DEBUG, ERROR, INFO, WARN, getLogger from sys import stdout from six import text_type +from ..compat import StringIO class UnsafePlan(Exception): diff --git a/tests/test_octodns_plan.py b/tests/test_octodns_plan.py index d0ef11a..a017431 100644 --- a/tests/test_octodns_plan.py +++ b/tests/test_octodns_plan.py @@ -5,11 +5,11 @@ from __future__ import absolute_import, division, print_function, \ unicode_literals -from StringIO import StringIO from logging import getLogger from six import 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 effe231..ddcd818 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 StringIO import StringIO from unittest import TestCase from yaml.constructor import ConstructorError +from octodns.compat import StringIO from octodns.yaml import safe_dump, safe_load