Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Import Callable and MutableMapping in py3compat for Python 2 compat #285

Merged
merged 1 commit into from
Nov 22, 2021

Conversation

davvid
Copy link
Contributor

@davvid davvid commented Nov 20, 2021

The PY2 code path was not importing Callable, which breaks the
compat module when it tries to import Callable from py3compat.

Signed-off-by: David Aguilar [email protected]

The PY2 code path was not importing Callable, which breaks the
compat module when it tries to import Callable from py3compat.

Signed-off-by: David Aguilar <[email protected]>
@davvid
Copy link
Contributor Author

davvid commented Nov 20, 2021

Thanks again for qtpy! I patched this in our vendored copy.

Heads-up @comand -- thanks for the report.

Copy link
Member

@CAM-Gerlach CAM-Gerlach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @davvid — just in time to get this in for what will probably be the final QtPy 1.x release (1.11.3).

@CAM-Gerlach
Copy link
Member

CAM-Gerlach commented Nov 20, 2021

@davvid Just to make sure you're briefed on our plans, 1.11.3 is planned to be the last 1.x release before QtPy 2.0 comes out in the next few weeks (certainly before the end of the year), which adds support for PySide6 and PyQt6, and drops it for the long-EoL PyQt4/Pyside1 and Python 2. Of course, since you have it vendored, you can keep patching it if needed, but we'd love for you to try out QtPy 2.0 (at least after #271 is merged) and let us know if you run into any issues we can fix, Thanks!

@CAM-Gerlach CAM-Gerlach changed the title py3compat: import Callable and MulableMapping for py2 compat PR: Import Callable and MutableMapping in py3compat for Python 2 compat Nov 20, 2021
Copy link
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks @davvid for your help with this!

@ccordoba12
Copy link
Member

Thanks again for qtpy!

Hey @davvid, nice to see you around. And thanks a lot for git-cola too! (I'm a faithful user to this day).

Copy link
Member

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @davvid for the help here! LGTM 👍 too

@dalthviz dalthviz merged commit 519ac9c into spyder-ide:1.x Nov 22, 2021
dalthviz added a commit that referenced this pull request Nov 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants