diff --git a/setup.py b/setup.py index caa37f16e..f773652af 100644 --- a/setup.py +++ b/setup.py @@ -119,6 +119,9 @@ install_requires = [ # WebSocket library for twisted and asyncio "autobahn >= 19.5.2", + + # Support for Python 3 transition + "future >= 0.18.2", ] setup_requires = [ diff --git a/src/allmydata/test/test_humanreadable.py b/src/allmydata/test/test_humanreadable.py index ea1d9ce9f..7df6e2cf3 100644 --- a/src/allmydata/test/test_humanreadable.py +++ b/src/allmydata/test/test_humanreadable.py @@ -1,12 +1,17 @@ """Tests for allmydata.util.humanreadable.""" +from __future__ import unicode_literals +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from future import standard_library +standard_library.install_aliases() +from builtins import * from twisted.trial import unittest from allmydata.util import humanreadable - - def foo(): pass # keep the line number constant @@ -17,7 +22,7 @@ class NoArgumentException(Exception): class HumanReadable(unittest.TestCase): def test_repr(self): hr = humanreadable.hr - self.failUnlessEqual(hr(foo), "") + self.failUnlessEqual(hr(foo), "") self.failUnlessEqual(hr(self.test_repr), ">") self.failUnlessEqual(hr(long(1)), "1") @@ -37,7 +42,9 @@ class HumanReadable(unittest.TestCase): except Exception as e: self.failUnless( hr(e) == "" # python-2.4 - or hr(e) == "ValueError('oops',)") # python-2.5 + or hr(e) == "ValueError('oops',)" # python-2.5 + or hr(e) == "ValueError(u'oops',)" # python 2 during py3 transition + ) try: raise NoArgumentException except Exception as e: