1
0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00

Use six's StringIO, remove compat.py

This commit is contained in:
Ross McFarland
2019-10-07 09:40:23 -07:00
parent 3c75dc81f8
commit 7867ad2093
4 changed files with 3 additions and 15 deletions

View File

@@ -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

View File

@@ -8,8 +8,7 @@ from __future__ import absolute_import, division, print_function, \
from logging import DEBUG, ERROR, INFO, WARN, getLogger from logging import DEBUG, ERROR, INFO, WARN, getLogger
from sys import stdout from sys import stdout
from six import text_type from six import StringIO, text_type
from ..compat import StringIO
class UnsafePlan(Exception): class UnsafePlan(Exception):

View File

@@ -6,10 +6,9 @@ from __future__ import absolute_import, division, print_function, \
unicode_literals unicode_literals
from logging import getLogger from logging import getLogger
from six import text_type from six import StringIO, text_type
from unittest import TestCase from unittest import TestCase
from octodns.compat import StringIO
from octodns.provider.plan import Plan, PlanHtml, PlanLogger, PlanMarkdown from octodns.provider.plan import Plan, PlanHtml, PlanLogger, PlanMarkdown
from octodns.record import Create, Delete, Record, Update from octodns.record import Create, Delete, Record, Update
from octodns.zone import Zone from octodns.zone import Zone

View File

@@ -5,10 +5,10 @@
from __future__ import absolute_import, division, print_function, \ from __future__ import absolute_import, division, print_function, \
unicode_literals unicode_literals
from six import StringIO
from unittest import TestCase from unittest import TestCase
from yaml.constructor import ConstructorError from yaml.constructor import ConstructorError
from octodns.compat import StringIO
from octodns.yaml import safe_dump, safe_load from octodns.yaml import safe_dump, safe_load