The branch, master has been updated via d81c9cd Remove more pointless encoding. from 6bfd1e4 Get rid of some unicode.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d81c9cd5e8fc9ebfb7c42508c8f46fd8b6910132 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Nov 17 11:19:32 2010 +0100 Remove more pointless encoding. ----------------------------------------------------------------------- Summary of changes: buildfarm/hostdb.py | 4 ++-- buildfarm/web/__init__.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/hostdb.py b/buildfarm/hostdb.py index ed4e753..24186c2 100644 --- a/buildfarm/hostdb.py +++ b/buildfarm/hostdb.py @@ -125,7 +125,7 @@ class HostDatabase(object): """Write out the web/""" for host in self.hosts(): - yield "%s: %s\n" % (host.name.encode("utf-8"), host.platform.encode("utf-8")) + yield "%s: %s\n" % (host.name, host.platform.encode("utf-8")) def commit(self): pass @@ -143,7 +143,7 @@ class PlainTextHostDatabase(HostDatabase): try: for l in f: (host, platform) = l.split(":", 1) - ret[host.decode("utf-8")] = platform.strip().decode("utf-8") + ret[host] = platform.strip().decode("utf-8") finally: f.close() return cls(ret) diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 159085f..7badf2d 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -628,9 +628,9 @@ class ViewRecentBuildsPage(BuildFarmPage): build.age, host.platform.encode("utf-8"), "<a href='%s?function=View+Host;host=%s;tree=%s;compiler=%s#%s'>%s</a>" - % (myself, host.name.encode("utf-8"), - tree, build.compiler.encode("utf-8"), host.name.encode("utf-8"), - host.name.encode("utf-8")), + % (myself, host.name, + tree, build.compiler, host.name, + host.name), build.compiler, tree, status, build.status(), revision_link(myself, revision, tree), revision_time]) @@ -674,7 +674,7 @@ class ViewHostPage(BuildFarmPage): def _render_build_list_header(self, host): yield "<div class='host summary'>" yield "<a id='host' name='host'/>" - yield "<h3>%s - %s</h3>" % (host.encode("utf-8"), self.buildfarm.hostdb.host(host).platform.encode("utf-8")) + yield "<h3>%s - %s</h3>" % (host, self.buildfarm.hostdb.host(host).platform.encode("utf-8")) yield "<table class='real'>" yield "<thead><tr><th>Target</th><th>Build<br/>Revision</th><th>Build<br />Age</th><th>Status<br />config/build<br />install/test</th><th>Warnings</th></tr></thead>" yield "<tbody>" @@ -734,7 +734,7 @@ class ViewHostPage(BuildFarmPage): "Tree", "Compiler", "Build Age", "Status", "Warnings") for build in builds: yield "%-12s %-10s %-10s %-10s %-10s\n" % ( - build.tree.encode("utf-8"), build.compiler.encode("utf-8"), + build.tree, build.compiler, util.dhm_time(build.age), str(build.status()), build.err_count()) yield "\n" @@ -895,7 +895,7 @@ class BuildFarmApp(object): self.buildfarm = buildfarm # host.properties are unicode object and the framework expect string object - self.hosts = dict([(host.name.encode("utf-8"), host) for host in self.buildfarm.hostdb.hosts()]) + self.hosts = dict([(host.name, host) for host in self.buildfarm.hostdb.hosts()]) def main_menu(self): """main page""" -- build.samba.org