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

Removal of python-future compatibility code #531

Merged
merged 23 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
30907df
Remove all imports of print_function compatibility method
knabar Feb 6, 2024
bfbe350
Replace all instances of isbytes and bytes_to_native_str
knabar Feb 6, 2024
2d9b411
Replace all usages of past.builtins.basestring
knabar Feb 6, 2024
f25db1a
Remove usage of past.builtins.long and "import long"
knabar Feb 6, 2024
6a71b74
Remove usage of future.standard_library.install_aliases
knabar Feb 6, 2024
8fa11fa
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 6, 2024
d9f88d2
Cleanup miscellaneous Python 2 codepaths
knabar Feb 7, 2024
e8f8ca5
Remove all unnecessary builtins imports
knabar Feb 7, 2024
913b76b
Remove future dependency
knabar Feb 7, 2024
5671f8e
Clean up outdated Docker infrastructure
knabar Feb 7, 2024
7db0f55
Remove Python version check
knabar Feb 7, 2024
0c4bc24
Remove more Python 2 compatibility code
knabar Feb 7, 2024
bb3a7f1
Fix flake8
knabar Feb 7, 2024
43a887f
Update build matrix by adding 3.12 and removing 3.8
knabar Feb 7, 2024
d4368c0
Fix flake8
knabar Feb 7, 2024
2edac67
Temporarily point at omero-py GitHub branch with Python 3.12 changes
sbesson Feb 8, 2024
5112ea7
Add Python 3.8 back to build matrix
knabar Feb 8, 2024
ad3ac72
Clean up thread check
knabar Feb 8, 2024
52c84a6
Temporarily require omero-py development branch
knabar Feb 8, 2024
538c256
Set omero-py version
knabar Feb 23, 2024
03ca53e
Remove custom omero-py version from tox
knabar Feb 23, 2024
7ddf814
Fix missing build matrix entry
knabar Feb 27, 2024
60ce356
Remove comment
knabar Feb 27, 2024
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
Prev Previous commit
Next Next commit
Remove more Python 2 compatibility code
  • Loading branch information
knabar committed Feb 7, 2024
commit 0c4bc2485b664912e19de77d6da10076aecb834f
5 changes: 1 addition & 4 deletions omeroweb/webadmin/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@

import logging

try:
from collections import OrderedDict # Python 2.7+ only
except Exception:
pass
from collections import OrderedDict

from django import forms
from django.forms.widgets import Textarea
Expand Down
3 changes: 1 addition & 2 deletions omeroweb/webclient/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5034,8 +5034,7 @@ def run_script(request, conn, sId, inputMap, scriptName="Script"):
request.session.modified = True
except Exception as x:
jobId = str(time()) # E.g. 1312803670.6076391
# handle python 2 or 3 errors
message = x.message if hasattr(x, "message") else (x.args[0] if x.args else "")
message = x.args[0] if x.args else ""
if message and message.startswith("No processor available"):
# omero.ResourceError
logger.info(traceback.format_exc())
Expand Down
Loading