From 8c9e6b048ae319f04994879425a126fadba3073f Mon Sep 17 00:00:00 2001 From: Michael William Boldt Date: Mon, 10 Oct 2016 08:39:49 -0500 Subject: [PATCH] Fix unicode vs ascii issues. --- setup.py | 2 +- tile_generator/bosh.py | 2 +- tile_generator/build.py | 2 +- tile_generator/build_unittest.py | 4 ++-- tile_generator/erb.py | 2 +- tile_generator/opsmgr.py | 2 +- tile_generator/opsmgr_unittest.py | 2 +- tile_generator/pcf.py | 3 +-- tile_generator/template.py | 2 +- tile_generator/tile.py | 3 +-- tile_generator/util.py | 2 +- 11 files changed, 12 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index c8d77219..ab22d39d 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function from setuptools import setup import os import sys diff --git a/tile_generator/bosh.py b/tile_generator/bosh.py index d5a0b812..29203f6e 100644 --- a/tile_generator/bosh.py +++ b/tile_generator/bosh.py @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function import os import sys import errno diff --git a/tile_generator/build.py b/tile_generator/build.py index 5de04a5f..eec4de25 100644 --- a/tile_generator/build.py +++ b/tile_generator/build.py @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function import os import sys import errno diff --git a/tile_generator/build_unittest.py b/tile_generator/build_unittest.py index 926a0029..71ad9e6c 100644 --- a/tile_generator/build_unittest.py +++ b/tile_generator/build_unittest.py @@ -14,12 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function import unittest from . import build import sys from contextlib import contextmanager -from io import StringIO +from StringIO import StringIO @contextmanager def capture_output(): diff --git a/tile_generator/erb.py b/tile_generator/erb.py index 60e2c5fd..accb69b3 100644 --- a/tile_generator/erb.py +++ b/tile_generator/erb.py @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function import os import sys import errno diff --git a/tile_generator/opsmgr.py b/tile_generator/opsmgr.py index 2a1e2f68..f08ea34c 100644 --- a/tile_generator/opsmgr.py +++ b/tile_generator/opsmgr.py @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function import sys import yaml import json diff --git a/tile_generator/opsmgr_unittest.py b/tile_generator/opsmgr_unittest.py index 0fb1df17..e7bf0aec 100644 --- a/tile_generator/opsmgr_unittest.py +++ b/tile_generator/opsmgr_unittest.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function import unittest import mock import requests diff --git a/tile_generator/pcf.py b/tile_generator/pcf.py index 51665110..e04880ef 100755 --- a/tile_generator/pcf.py +++ b/tile_generator/pcf.py @@ -16,8 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# no unicode_literals here because http://click.pocoo.org/python3/ -from __future__ import absolute_import, division, print_function#, unicode_literals +from __future__ import absolute_import, division, print_function import os import sys import yaml diff --git a/tile_generator/template.py b/tile_generator/template.py index b322e244..d53723dd 100644 --- a/tile_generator/template.py +++ b/tile_generator/template.py @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function import os import sys import errno diff --git a/tile_generator/tile.py b/tile_generator/tile.py index 4ea3dbd3..00aa963d 100755 --- a/tile_generator/tile.py +++ b/tile_generator/tile.py @@ -16,8 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# no unicode_literals here because http://click.pocoo.org/python3/ -from __future__ import absolute_import, division, print_function#, unicode_literals +from __future__ import absolute_import, division, print_function import click import sys import os diff --git a/tile_generator/util.py b/tile_generator/util.py index 07e2d2d8..d47fb2a2 100644 --- a/tile_generator/util.py +++ b/tile_generator/util.py @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import, division, print_function, unicode_literals +from __future__ import absolute_import, division, print_function import errno import os import requests