upstream/ipython Files · IPython · RhodeCode Free Hosting

Fix Qt loader commit_api() for 'pyqtv1' or 'pyqtdefault'...

Fix Qt loader commit_api() for 'pyqtv1' or 'pyqtdefault' Our Qt loaders have three options representing PyQt - pyqt (with v2 strings API), pyqtv1 (v1 ditto), and pyqtdefault, which is v2 on Python 3 only. When loading pyqtv1 or pyqtdefault, the code to deny imports of other bindings would assume that api != pyqt meant we were using pyqt5, and forbid future imports of PyQt4. This changes the logic around so PyQt4 is the else: case, catching all three possible names for it. PyQt5 and PySide have, so far, only one name each.

Thomas Kluyver -


            r18405:5f275fe1

Name	Size	Modified	Last Commit	Author
/ IPython
config
core
extensions
external
html
kernel
lib
nbconvert
nbformat
parallel
qt
sphinxext
terminal
testing
utils
__init__.py	Loading ...
__main__.py	Loading ...
consoleapp.py	Loading ...
display.py	Loading ...
frontend.py	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages