Remove more Python 2 compatibility code

ome · Feb 7, 2024 · 0c4bc24 · 0c4bc24
1 parent 7db0f55
commit 0c4bc24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/omeroweb/webadmin/forms.py b/omeroweb/webadmin/forms.py
@@ -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

diff --git a/omeroweb/webclient/views.py b/omeroweb/webclient/views.py
@@ -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())