[Python-modules-team] Bug#795848: FTBTS: foolscap

[Ramakrishnan Muthukrishnan]

tag 795848 patch

I applied two patches below after which it passes the tests (python
setup.py trial). Both the changes have been submitted into the upstream
for review.

Thanks
Ramakrishnan

diff --git a/foolscap/__init__.py b/foolscap/__init__.py
index f08ef1b..6c324e1 100644
--- a/foolscap/__init__.py
+++ b/foolscap/__init__.py
@@ -1,5 +1,5 @@
 """Foolscap"""
 
 from ._version import get_versions
-__version__ = get_versions()['version']
+__version__ = str(get_versions()['version'])
 del get_versions


diff --git a/foolscap/test/test_logging.py
b/foolscap/test/test_logging.py
index ca38a22..72da798 100644
--- a/foolscap/test/test_logging.py
+++ b/foolscap/test/test_logging.py
@@ -1525,7 +1525,7 @@ class Tail(unittest.TestCase):
                        })
         outmsg = out.getvalue()
         # this contains a localtime string, so don't check the hour
-        self.failUnless(":25:06.527 L25 []#123 howdy" in outmsg)
+        self.failUnless(":06.527 L25 []#123 howdy" in outmsg)
 
         lp.remote_msg({"time": 1207005907.527782,
                        "level": 25,
@@ -1535,7 +1535,7 @@ class Tail(unittest.TestCase):
                        })
         outmsg = out.getvalue()
         # this contains a localtime string, so don't check the hour
-        self.failUnless(":25:07.527 L25 []#124 howdy pardner" in
outmsg)
+        self.failUnless(":07.527 L25 []#124 howdy pardner" in outmsg)
 
         try:
             raise RuntimeError("fake error")
@@ -1550,7 +1550,7 @@ class Tail(unittest.TestCase):
                        })
         outmsg = out.getvalue()
 
-        self.failUnless(":25:50.002 L30 []#125 oops\n FAILURE:\n" in
outmsg,
+        self.failUnless(":50.002 L30 []#125 oops\n FAILURE:\n" in
outmsg,
                         outmsg)
         self.failUnless("exceptions.RuntimeError" in outmsg, outmsg)
         self.failUnless(": fake error" in outmsg, outmsg)