[SCM] Git repository for devscripts branch, master, updated. v2.12.0-26-g0f4cc95

[Benjamin Drung]

The following commit has been merged in the master branch:
commit a292500e960b2652bb6cab6b3fa0c766138a4d1f
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Aug 4 11:51:46 2012 +0200

    Make test_help.py valid Python 3 code.

diff --git a/scripts/devscripts/test/test_help.py b/scripts/devscripts/test/test_help.py
index c09459f..4f0c9bf 100644
--- a/scripts/devscripts/test/test_help.py
+++ b/scripts/devscripts/test/test_help.py
@@ -76,5 +76,5 @@ class HelpTestCase(unittest.TestCase):
             self.assertEqual(process.poll(), 0,
                              "%s failed to return usage within %i seconds.\n"
                              "Output:\n%s"
-                             % (script, TIMEOUT, ''.join(out)))
+                             % (script, TIMEOUT, ''.encode('ascii').join(out)))
         return tester

-- 
Git repository for devscripts