diff --git a/README b/README index 617c71f6f..fe0dbe8e0 100644 --- a/README +++ b/README @@ -26,7 +26,6 @@ The following libraries are optional and provide better debugging: * https://pypi.python.org/pypi/colorlog/[colorlog] * On Windows: https://pypi.python.org/pypi/colorama/[colorama] -* https://pypi.python.org/pypi/ipdb[IPython/ipdb] .On Debian: diff --git a/pkg/PKGBUILD.qutebrowser-git b/pkg/PKGBUILD.qutebrowser-git index b6557a390..9c06be0eb 100644 --- a/pkg/PKGBUILD.qutebrowser-git +++ b/pkg/PKGBUILD.qutebrowser-git @@ -11,8 +11,7 @@ license=('GPL') depends=('python>=3.3' 'python-setuptools' 'python-pyqt5>=5.2' 'qt5-base>=5.2' 'qt5-webkit>=5.2' 'libxkbcommon-x11' 'python-rfc6266') makedepends=('python' 'python-setuptools') -optdepends=('python-colorlog: colored logging output' - 'python-ipdb: better debugging') +optdepends=('python-colorlog: colored logging output') options=(!emptydirs) source=('qutebrowser::git://the-compiler.org/qutebrowser') md5sums=('SKIP') diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py index 0a9f450c1..c8b3f443a 100644 --- a/qutebrowser/utils/debug.py +++ b/qutebrowser/utils/debug.py @@ -20,6 +20,7 @@ """Utilities used for debugging.""" import re +import pdb import sys import types from functools import wraps @@ -28,14 +29,6 @@ from PyQt5.QtCore import pyqtRemoveInputHook, QEvent, QCoreApplication from qutebrowser.utils.misc import elide from qutebrowser.utils.log import misc as logger - - -try: - # pylint: disable=import-error - from ipdb import set_trace as pdb_set_trace -except ImportError: - from pdb import set_trace as pdb_set_trace - import qutebrowser.commands.utils as cmdutils @@ -52,7 +45,7 @@ def set_trace(): print(" from PyQt5 import QtCore; QtCore.pyqtRestoreInputHook()") print("before executing c(ontinue).") pyqtRemoveInputHook() - pdb_set_trace() + pdb.set_trace() @cmdutils.register(debug=True) diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index a3e05fa57..c4408ade4 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -157,15 +157,6 @@ def _module_versions(): e.__class__.__name__, e)) lines.append('SIP: ?') - try: - import ipdb - import IPython - except ImportError: - pass - else: - ver = getattr(IPython, '__version__', 'yes') - lines.append('ipdb/IPython: {}'.format(ver)) - try: import colorlog except ImportError: diff --git a/setup.py b/setup.py index c0eb9a332..208e55dd8 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ try: ['qutebrowser = qutebrowser.qutebrowser:main']}, test_suite='qutebrowser.test', zip_safe=True, - extras_require={'nice-debugging': ['colorlog', 'colorama', 'ipdb']}, + extras_require={'nice-debugging': ['colorlog', 'colorama']}, **setupdata ) finally: