From 05a9732dbbea0ea86215742e72a3cb6b0429c096 Mon Sep 17 00:00:00 2001 From: John Schember Date: Tue, 5 May 2009 06:55:28 -0400 Subject: [PATCH] Wrong init arg. Remove unknown argument. --- src/calibre/gui2/convert/single.py | 2 +- upload.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py index 295656237b..27e1fb3bf4 100644 --- a/src/calibre/gui2/convert/single.py +++ b/src/calibre/gui2/convert/single.py @@ -89,7 +89,7 @@ class Config(ResizableDialog, Ui_Dialog): None) self.setup_input_output_formats(db, book_id, preferred_input_format, - preferred_input_format) + preferred_output_format) self.db, self.book_id = db, book_id self.setup_pipeline() diff --git a/upload.py b/upload.py index 2a6261e3bc..131c43c56c 100644 --- a/upload.py +++ b/upload.py @@ -286,7 +286,7 @@ class gui(OptionlessCommand): with open('images.qrc', 'wb') as f: f.write(manifest) try: - check_call(['pyrcc4', '-py2', '-o', images, 'images.qrc']) + check_call(['pyrcc4', '-o', images, 'images.qrc']) except: import traceback traceback.print_exc()