Get rid of ipdb/IPython.
This caused more problems than it's worth really, and it does some black magic I'm not comfortable with.
This commit is contained in:
parent
3ce9945bc9
commit
4b95f369a4
1
README
1
README
@ -26,7 +26,6 @@ The following libraries are optional and provide better debugging:
|
|||||||
|
|
||||||
* https://pypi.python.org/pypi/colorlog/[colorlog]
|
* https://pypi.python.org/pypi/colorlog/[colorlog]
|
||||||
* On Windows: https://pypi.python.org/pypi/colorama/[colorama]
|
* On Windows: https://pypi.python.org/pypi/colorama/[colorama]
|
||||||
* https://pypi.python.org/pypi/ipdb[IPython/ipdb]
|
|
||||||
|
|
||||||
.On Debian:
|
.On Debian:
|
||||||
|
|
||||||
|
@ -11,8 +11,7 @@ license=('GPL')
|
|||||||
depends=('python>=3.3' 'python-setuptools' 'python-pyqt5>=5.2' 'qt5-base>=5.2'
|
depends=('python>=3.3' 'python-setuptools' 'python-pyqt5>=5.2' 'qt5-base>=5.2'
|
||||||
'qt5-webkit>=5.2' 'libxkbcommon-x11' 'python-rfc6266')
|
'qt5-webkit>=5.2' 'libxkbcommon-x11' 'python-rfc6266')
|
||||||
makedepends=('python' 'python-setuptools')
|
makedepends=('python' 'python-setuptools')
|
||||||
optdepends=('python-colorlog: colored logging output'
|
optdepends=('python-colorlog: colored logging output')
|
||||||
'python-ipdb: better debugging')
|
|
||||||
options=(!emptydirs)
|
options=(!emptydirs)
|
||||||
source=('qutebrowser::git://the-compiler.org/qutebrowser')
|
source=('qutebrowser::git://the-compiler.org/qutebrowser')
|
||||||
md5sums=('SKIP')
|
md5sums=('SKIP')
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
"""Utilities used for debugging."""
|
"""Utilities used for debugging."""
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
import pdb
|
||||||
import sys
|
import sys
|
||||||
import types
|
import types
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
@ -28,14 +29,6 @@ from PyQt5.QtCore import pyqtRemoveInputHook, QEvent, QCoreApplication
|
|||||||
|
|
||||||
from qutebrowser.utils.misc import elide
|
from qutebrowser.utils.misc import elide
|
||||||
from qutebrowser.utils.log import misc as logger
|
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
|
import qutebrowser.commands.utils as cmdutils
|
||||||
|
|
||||||
|
|
||||||
@ -52,7 +45,7 @@ def set_trace():
|
|||||||
print(" from PyQt5 import QtCore; QtCore.pyqtRestoreInputHook()")
|
print(" from PyQt5 import QtCore; QtCore.pyqtRestoreInputHook()")
|
||||||
print("before executing c(ontinue).")
|
print("before executing c(ontinue).")
|
||||||
pyqtRemoveInputHook()
|
pyqtRemoveInputHook()
|
||||||
pdb_set_trace()
|
pdb.set_trace()
|
||||||
|
|
||||||
|
|
||||||
@cmdutils.register(debug=True)
|
@cmdutils.register(debug=True)
|
||||||
|
@ -157,15 +157,6 @@ def _module_versions():
|
|||||||
e.__class__.__name__, e))
|
e.__class__.__name__, e))
|
||||||
lines.append('SIP: ?')
|
lines.append('SIP: ?')
|
||||||
|
|
||||||
try:
|
|
||||||
import ipdb
|
|
||||||
import IPython
|
|
||||||
except ImportError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
ver = getattr(IPython, '__version__', 'yes')
|
|
||||||
lines.append('ipdb/IPython: {}'.format(ver))
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import colorlog
|
import colorlog
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
2
setup.py
2
setup.py
@ -47,7 +47,7 @@ try:
|
|||||||
['qutebrowser = qutebrowser.qutebrowser:main']},
|
['qutebrowser = qutebrowser.qutebrowser:main']},
|
||||||
test_suite='qutebrowser.test',
|
test_suite='qutebrowser.test',
|
||||||
zip_safe=True,
|
zip_safe=True,
|
||||||
extras_require={'nice-debugging': ['colorlog', 'colorama', 'ipdb']},
|
extras_require={'nice-debugging': ['colorlog', 'colorama']},
|
||||||
**setupdata
|
**setupdata
|
||||||
)
|
)
|
||||||
finally:
|
finally:
|
||||||
|
Loading…
Reference in New Issue
Block a user