The branch, master has been updated via cfdeca5 Properly encode dictionary elements. from 52a2144 Remove now obsolete hostdb.pm.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit cfdeca50120dceb9f0bb3e5d161a185c93159def Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Nov 13 20:09:11 2010 +0100 Properly encode dictionary elements. ----------------------------------------------------------------------- Summary of changes: buildfarm/tests/test_data.py | 5 ++++- import-and-analyse.py | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py index 5c233c2..e79224b 100755 --- a/buildfarm/tests/test_data.py +++ b/buildfarm/tests/test_data.py @@ -97,7 +97,10 @@ bla BUILD COMMIT TIME: 3 August 2010 """) build = self.x.get_build("tdb", "charis", "cc", "12") - self.assertEquals(("43", "3 August 2010"), build.revision_details()) + (rev, timestamp) = build.revision_details() + self.assertIsInstance(rev, str) + self.assertIsInstance(timestamp, str) + self.assertEquals(("43", "3 August 2010"), (rev, timestamp)) def test_revision_details_no_timestamp(self): self.create_mock_logfile("tdb", "charis", "cc", rev="12", contents=""" diff --git a/import-and-analyse.py b/import-and-analyse.py index 8ce42b2..3891f1e 100755 --- a/import-and-analyse.py +++ b/import-and-analyse.py @@ -69,8 +69,18 @@ See http://build.samba.org/?function=View+Build;host=%(host)s;tree=%(tree)s;comp The build may have been broken by one of the following commits: %(change_log)s - """ % {"tree": tree, "host": host, "compiler": compiler, "change_log": change_log, "scm": t.scm, "branch": t.branch, - "cur_rev": cur_rev, "old_rev": old_rev, "cur_status": cur_status, "old_status": old_status } + """ % { + "tree": tree.encode("utf-8"), + "host": host.encode("utf-8"), + "compiler": compiler.encode("utf-8"), + "change_log": change_log, + "scm": t.scm, + "branch": t.branch, + "cur_rev": cur_rev, + "old_rev": old_rev, + "cur_status": cur_status, + "old_status": old_status, + } msg = MIMEText(body) msg["Subject"] = "BUILD of %s:%s BROKEN on %s with %s AT REVISION %s" % (tree, t.branch, host, compiler, cur_rev) -- build.samba.org