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

Split PR20 for better review: Make URLopener and xmlrpc compatible #24

Conversation

bernhardkaindl
Copy link
Collaborator

@bernhardkaindl bernhardkaindl commented Dec 4, 2023

2 commits, tested for py2 and py3:

  • Cherry-picks @qin Zhang (张琴)’s update to use python-pam
  • Update imports for urllib.URLopener, xmlrpclib, SocketServer and SimpleXMLRPCServer

In #18 (comment), Andrew (on the thread to not make the code more complicated) gave the direction to split the changes into two categories, with Python2/compatible changes to go into a Python2-compatible master first:

So, please can we collect together all commits which are py2-safe fixes, which can get reviewed and merged freely, and please keep all commits which break compatibility with py2 in a separate single PR so it can be merged all in one go. The final commit on the py3 branch should bump the major version number of xsconsole seeing as its a bit step change.

This would be the second to last PR on that, as it is easy (not complicated) to not break Python2 with this update, which would mean we would not have to fork the code into Py2/Py3 now.

bernhardkaindl and others added 2 commits December 6, 2023 05:07
Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
Commit message and a minor change to make it work by Bernhard Kaindl.
Committed code by Qin Zhang.

Tested on xs8 with:
- Python2: python-pam-0.1.4-1.el7.noarch
- Python3: python3-pam-1.8.4-1.xs8.noarch

Co-authored-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
Signed-off-by: Qin Zhang (张琴) <qin.zhang@citrix.com>
Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
@bernhardkaindl bernhardkaindl force-pushed the safe_pr20-import-URLopener-and-xmlrpc branch from f12540b to a9cff18 Compare December 6, 2023 15:12
@bernhardkaindl bernhardkaindl merged commit 11db3a8 into xapi-project:master Dec 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants