Merge branch 'master' of https://github.com/cf-platform-eng/tile-gene…

…rator

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
@@ -37,10 +37,7 @@ def get_version():
 		with open(version_file) as f:
 			return f.read()
 	except:
-		version = '0.0.0'
-		print("Warning: Generating default version", version, file=sys.stderr)
-		print("To override this, please create a file", version_file, "with the tile-generator version in it.", file=sys.stderr)
-		return version
+		return '0.0.0'
 
 setup(
 	name = "tile-generator",

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

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

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():

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

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

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

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

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

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

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