From 9ff2d5e9ce8c9d735827142a56707432ad91c62f Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Tue, 24 Jul 2012 20:09:47 +0100 Subject: [PATCH] Updated Compile GUI for Python 3 --- zeroinstall/0launch-gui/compile.py | 6 +++--- zeroinstall/0launch-gui/properties.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zeroinstall/0launch-gui/compile.py b/zeroinstall/0launch-gui/compile.py index 696e868..cd171c4 100644 --- a/zeroinstall/0launch-gui/compile.py +++ b/zeroinstall/0launch-gui/compile.py @@ -14,8 +14,8 @@ XMLNS_0COMPILE = 'http://zero-install.sourceforge.net/2006/namespaces/0compile' class Command: def __init__(self): self.child = None - self.error = "" - self.stdout = "" + self.error = b"" + self.stdout = b"" self.watched_streams = 0 def run(self, command, success, get_stdout = False): @@ -72,7 +72,7 @@ def compile(on_success, interface_uri, autocompile = False): def build(selections_xml): # Get the chosen versions - sels = selections.Selections(qdom.parse(ByteIO(selections_xml))) + sels = selections.Selections(qdom.parse(BytesIO(selections_xml))) impl = sels.selections[interface_uri] diff --git a/zeroinstall/0launch-gui/properties.py b/zeroinstall/0launch-gui/properties.py index 601387e..343c3fd 100644 --- a/zeroinstall/0launch-gui/properties.py +++ b/zeroinstall/0launch-gui/properties.py @@ -4,7 +4,7 @@ import zeroinstall import os from zeroinstall import _ -from zeroinstall.support import tasks +from zeroinstall.support import tasks, unicode from zeroinstall.injector.model import Interface, Feed, stable, testing, developer, stability_levels from zeroinstall.injector import writer, namespaces, gpg from zeroinstall.gtkui import help_box -- 2.11.4.GIT