Update to support python3.

Author: enolfc

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
         - "2.7"
+        - "3.4"
 
 install:
         - pip install tox
@@ -10,5 +11,6 @@ script:
 
 env:
         - TOXENV=py27
+        - TOXENV=py34
         - TOXENV=pep8
         - TOXENV=coveralls

caso/exception.py

@@ -16,6 +16,8 @@
 
 import sys
 
+import six
+
 from caso import log
 
 LOG = log.getLogger(__name__)
@@ -37,7 +39,7 @@ def __init__(self, message=None, **kwargs):
                 LOG.exception('Exception in string format operation')
                 for name, value in kwargs.iteritems():
                     LOG.error("%s: %s" % (name, value))
-                raise exc_info[0], exc_info[1], exc_info[2]
+                six.reraise(exc_info[0], exc_info[1], exc_info[2])
 
         super(CasoException, self).__init__(message)
 

caso/tests/base.py

@@ -19,6 +19,7 @@
 
 import fixtures
 from oslo.config import cfg
+import six
 import testtools
 
 CONF = cfg.CONF
@@ -58,5 +59,5 @@ def setUp(self):
     def flags(self, **kw):
         """Override flag variables for a test."""
         group = kw.pop('group', None)
-        for k, v in kw.iteritems():
+        for k, v in six.iteritems(kw):
             CONF.set_override(k, v, group)

caso/tests/test_manager.py

@@ -16,7 +16,6 @@
 Tests for `caso.manager` module.
 """
 
-import contextlib
 import datetime
 
 from dateutil import tz
@@ -36,7 +35,7 @@ def setUp(self):
             "messenger": mock.patch('caso.messenger.Manager'),
         }
         self.mocks = {}
-        for k, p in self.patchers.iteritems():
+        for k, p in six.iteritems(self.patchers):
             self.mocks[k] = p.start()
 
         self.manager = manager.Manager()
@@ -54,17 +53,20 @@ def test_lastrun_does_not_exist(self):
 
     def test_lastrun_exists(self):
         expected = datetime.datetime(2014, 12, 10, 13, 10, 26, 664598)
-        aux = six.StringIO(expected)
+        aux = six.StringIO(str(expected))
 
-        with contextlib.nested(
-            mock.patch("os.path.exists"),
-            mock.patch('__builtin__.open')
-        ) as (path, fopen):
-            fopen.return_value.__enter__ = lambda x: aux
-            fopen.return_value.__exit__ = mock.Mock()
-            path.return_value = True
+        if six.PY3:
+            builtins_open = 'builtins.open'
+        else:
+            builtins_open = '__builtin__.open'
 
-            self.assertEqual(expected, self.manager.lastrun)
+        with mock.patch("os.path.exists") as path:
+            with mock.patch(builtins_open) as fopen:
+                fopen.return_value.__enter__ = lambda x: aux
+                fopen.return_value.__exit__ = mock.Mock()
+                path.return_value = True
+
+                self.assertEqual(expected, self.manager.lastrun)
 
     def test_lastrun_is_invalid(self):
         aux = six.StringIO("foo")
@@ -74,15 +76,18 @@ def test_lastrun_is_invalid(self):
         def call(self):
             return self.manager.lastrun
 
-        with contextlib.nested(
-            mock.patch("os.path.exists"),
-            mock.patch('__builtin__.open')
-        ) as (path, fopen):
-            fopen.return_value.__enter__ = lambda x: aux
-            fopen.return_value.__exit__ = mock.Mock()
-            path.return_value = True
+        if six.PY3:
+            builtins_open = 'builtins.open'
+        else:
+            builtins_open = '__builtin__.open'
+
+        with mock.patch("os.path.exists") as path:
+            with mock.patch(builtins_open) as fopen:
+                fopen.return_value.__enter__ = lambda x: aux
+                fopen.return_value.__exit__ = mock.Mock()
+                path.return_value = True
 
-            self.assertRaises(ValueError, call, self)
+                self.assertRaises(ValueError, call, self)
 
     def test_dry_run(self):
         self.flags(dry_run=True)