Skip to content

Remove dangling use of python-future from rrdd.py #6247

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Remove dangling use of python-future from rrdd.py #6247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ocaml/xcp-rrdd/scripts/rrdd/rrdd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@

from __future__ import print_function

from future import standard_library
standard_library.install_aliases()
Copy link
Collaborator

Choose a reason for hiding this comment

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

If you drop this, you need httplib and xmlrpclib for Py2.7 compatibility.

Those are the only ones, so I'd suggest this form:

try:
    import http.client
except ImportError:
    import httplib

Copy link
Collaborator

Choose a reason for hiding this comment

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

we have dropped python2.7 support on xapi master.
Yangtze support is on another release branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This isn't packaged for Python 2 anymore

from builtins import str
from builtins import range
from builtins import object
import http.client
import os
import json
Expand Down
Loading