From d1629d2aef55c6ffd9beecda6a19e62dd1c79c9b Mon Sep 17 00:00:00 2001 From: Jarno Elonen Date: Tue, 18 Aug 2015 23:54:19 +0300 Subject: [PATCH] Python3 compatiblity fixes --- bin/make-deb | 4 ++-- make_deb/__init__.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/make-deb b/bin/make-deb index 7a93390..98fa56f 100644 --- a/bin/make-deb +++ b/bin/make-deb @@ -11,10 +11,10 @@ def main(): debconf = DebianConfiguration(os.getcwd()) debconf.render() except DebianConfigurationException as e: - print e + print(e) return 1 - print "'debian' directory successfully placed at the root of your repository" + print("'debian' directory successfully placed at the root of your repository") return 0 if __name__ == "__main__": diff --git a/make_deb/__init__.py b/make_deb/__init__.py index 9e392b8..2121156 100644 --- a/make_deb/__init__.py +++ b/make_deb/__init__.py @@ -54,18 +54,18 @@ def _context_from_setuppy(self): "--name", "--version", "--maintainer", "--maintainer-email", "--description"], stdout=subprocess.PIPE).communicate() - setup_values = stdout[0].split("\n")[0:-1] + setup_values = stdout[0].decode('utf-8').split("\n")[0:-1] setup_names = ["name", "version", "maintainer", "maintainer_email", "description"] context = {} for name, value in zip(setup_names, setup_values): while not value or value == UNKNOWN: - value = raw_input( + value = input( "The '{}' parameter is not defined in setup.py. " "Please define it for debian configuration: ".format(name)) if not value: - print "Invalid value. Please try again" + print("Invalid value. Please try again") context[name] = value @@ -81,17 +81,17 @@ def render(self): for template in self.DEBIAN_CONFIGURATION_TEMPLATES: filename = os.path.basename(template).replace(".j2", "") - content = Template(resource_string("make_deb", template)) \ + content = Template(resource_string("make_deb", template).decode('utf-8')) \ .render(self.context) with open(os.path.join(output_dir, filename), "wb") as f: - f.write(content) + f.write(content.encode('utf-8')) # Need to to trigger separately because filename must change trigger_content = Template( - resource_string("make_deb", "resources/debian/triggers.j2") + resource_string("make_deb", "resources/debian/triggers.j2").decode('utf-8') ).render(self.context) trigger_filename = "%s.triggers" % self.context['name'] with open(os.path.join(output_dir, trigger_filename), "wb") as f: - f.write(trigger_content+"\n") + f.write((trigger_content+"\n").encode('utf-8'))