From 2f07742f1dde22251e1c5d324e7cbeb701e2a789 Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <cyril.roelandt@enovance.com>
Date: Thu, 3 Apr 2014 21:32:24 +0200
Subject: [PATCH] Support Python 3

This patch fixes an issue similar to one fixed by
fa4ef4dc00e220ccbc0e171ee6d3ee898deab0a3 and adds the required trove
classifiers to setup.cfg.

Change-Id: Ia77e943612de9aea78128b142981e70665714e1b
---
 heatclient/tests/test_template_utils.py | 12 ++++++------
 setup.cfg                               |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/heatclient/tests/test_template_utils.py b/heatclient/tests/test_template_utils.py
index 74885044..5d1ea1a5 100644
--- a/heatclient/tests/test_template_utils.py
+++ b/heatclient/tests/test_template_utils.py
@@ -578,7 +578,7 @@ outputs:\n\
 
 class TestTemplateTypeFunctions(testtools.TestCase):
 
-    hot_template = '''heat_template_version: 2013-05-23
+    hot_template = b'''heat_template_version: 2013-05-23
 parameters:
   param1:
     type: string
@@ -606,21 +606,21 @@ resources:
         tmpl_file = '/home/my/dir/template.yaml'
         url = 'file:///home/my/dir/template.yaml'
         request.urlopen(url).AndReturn(
-            six.StringIO(self.hot_template))
+            six.BytesIO(self.hot_template))
         request.urlopen(
             'file:///home/my/dir/foo.yaml').InAnyOrder().AndReturn(
-                six.StringIO('foo contents'))
+                six.BytesIO(b'foo contents'))
         request.urlopen(
             'file:///home/my/dir/spam/egg.yaml').InAnyOrder().AndReturn(
-                six.StringIO('egg contents'))
+                six.BytesIO(b'egg contents'))
         self.m.ReplayAll()
 
         files, tmpl_parsed = template_utils.get_template_contents(
             template_file=tmpl_file)
 
         self.assertEqual({
-            u'file:///home/my/dir/foo.yaml': 'foo contents',
-            u'file:///home/my/dir/spam/egg.yaml': 'egg contents'
+            u'file:///home/my/dir/foo.yaml': b'foo contents',
+            u'file:///home/my/dir/spam/egg.yaml': b'egg contents'
         }, files)
         self.assertEqual({
             u'heat_template_version': u'2013-05-23',
diff --git a/setup.cfg b/setup.cfg
index 5aae3a42..121b1d47 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,8 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 2.6
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.3
 
 [files]
 packages =