Browse Source

Use six's StringIO, remove compat.py

pull/384/head
Ross McFarland 6 years ago
parent
commit
7867ad2093
No known key found for this signature in database GPG Key ID: 61C10C4FC8FE4A89
4 changed files with 3 additions and 15 deletions
  1. +0
    -10
      octodns/compat.py
  2. +1
    -2
      octodns/provider/plan.py
  3. +1
    -2
      tests/test_octodns_plan.py
  4. +1
    -1
      tests/test_octodns_yaml.py

+ 0
- 10
octodns/compat.py 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

+ 1
- 2
octodns/provider/plan.py 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 ..compat import StringIO
from six import StringIO, text_type
class UnsafePlan(Exception): class UnsafePlan(Exception):


+ 1
- 2
tests/test_octodns_plan.py 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


+ 1
- 1
tests/test_octodns_yaml.py 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


Loading…
Cancel
Save