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:
@@ -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
|
||||
@@ -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):
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user