diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 7b94c1e821..54f0bd3517 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -12,18 +12,17 @@ __docformat__ = 'restructuredtext en'
import collections, os, sys, textwrap, time, gc
from Queue import Queue, Empty
from threading import Thread
-from PyQt4.Qt import Qt, SIGNAL, QTimer, QHelpEvent, QAction, \
- QMenu, QIcon, pyqtSignal, \
- QDialog, QSystemTrayIcon, QApplication, QKeySequence
+from PyQt4.Qt import (Qt, SIGNAL, QTimer, QHelpEvent, QAction,
+ QMenu, QIcon, pyqtSignal, QUrl,
+ QDialog, QSystemTrayIcon, QApplication, QKeySequence)
from calibre import prints
from calibre.constants import __appname__, isosx
-from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.config import prefs, dynamic
from calibre.utils.ipc.server import Server
from calibre.library.database2 import LibraryDatabase2
from calibre.customize.ui import interface_actions
-from calibre.gui2 import error_dialog, GetMetadata, open_local_file, \
+from calibre.gui2 import error_dialog, GetMetadata, open_url, \
gprefs, max_available_height, config, info_dialog, Dispatcher, \
question_dialog
from calibre.gui2.cover_flow import CoverFlowMixin
@@ -567,37 +566,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
QApplication.instance().quit()
def donate(self, *args):
- BUTTON = '''
-
- '''
- MSG = _('is the result of the efforts of many volunteers from all '
- 'over the world. If you find it useful, please consider '
- 'donating to support its development. Your donation helps '
- 'keep calibre development going.')
- HTML = u'''
-
-
-
- Donate to support calibre
-
-
-
- Calibre %s
- %s
-
-
- '''%(P('content_server/calibre_banner.png').replace(os.sep, '/'), MSG, BUTTON)
- pt = PersistentTemporaryFile('_donate.htm')
- pt.write(HTML.encode('utf-8'))
- pt.close()
- open_local_file(pt.name)
-
+ open_url(QUrl('http://calibre-ebook.com/donate'))
def confirm_quit(self):
if self.job_manager.has_jobs():
diff --git a/src/calibre/trac/bzr_commit_plugin.py b/src/calibre/trac/bzr_commit_plugin.py
index c70e6fbf13..c70e8db703 100644
--- a/src/calibre/trac/bzr_commit_plugin.py
+++ b/src/calibre/trac/bzr_commit_plugin.py
@@ -26,7 +26,7 @@ class cmd_commit(_cmd_commit):
close_bug_pat = re.compile(close_bug, re.IGNORECASE)
match = close_bug_pat.search(msg)
if not match:
- return msg, None, None, None
+ return msg, None, None
action, bug = match.group(1), match.group(2)
summary = ''
raw = urllib.urlopen('https://bugs.launchpad.net/calibre/+bug/' +