From 3704c9880d6df449837badcc52cdc159fb3be6db Mon Sep 17 00:00:00 2001 From: Manvendra Singh Date: Thu, 18 May 2017 15:32:26 +0530 Subject: [PATCH] py3 fix: use six StringIO import --- schema_salad/makedoc.py | 3 ++- schema_salad/ref_resolver.py | 5 +++-- schema_salad/tests/test_cli_args.py | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/schema_salad/makedoc.py b/schema_salad/makedoc.py index 01af98af..cde11ee0 100644 --- a/schema_salad/makedoc.py +++ b/schema_salad/makedoc.py @@ -7,7 +7,7 @@ import copy import re import sys -from StringIO import StringIO + import logging from . import schema @@ -16,6 +16,7 @@ import six from six.moves import range from six.moves.urllib import parse +from six import StringIO from typing import cast, Any, Dict, IO, List, Optional, Set, Text, Union diff --git a/schema_salad/ref_resolver.py b/schema_salad/ref_resolver.py index bc2e691d..cf5ad8d4 100644 --- a/schema_salad/ref_resolver.py +++ b/schema_salad/ref_resolver.py @@ -9,12 +9,13 @@ import six from six.moves import range import urllib -# import urlparse + from six.moves.urllib import parse +from six import StringIO import re import copy -from StringIO import StringIO + from . import validate from schema_salad.utils import aslist, flatten diff --git a/schema_salad/tests/test_cli_args.py b/schema_salad/tests/test_cli_args.py index 60945673..16b7e5cf 100644 --- a/schema_salad/tests/test_cli_args.py +++ b/schema_salad/tests/test_cli_args.py @@ -4,9 +4,9 @@ import schema_salad.main as cli_parser -""" for capturing print() output """ +# for capturing print() output from contextlib import contextmanager -from StringIO import StringIO +from six import StringIO @contextmanager def captured_output():