Skip to content

Commit 56fc9f6

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent e638fda commit 56fc9f6

File tree

17 files changed

+56
-145
lines changed

17 files changed

+56
-145
lines changed

omeroweb/api/api_marshal.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
"""Helper functions for views that handle object trees."""
2121

22-
2322
from omero_marshal import get_encoder
2423

2524

omeroweb/api/api_query.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919

2020
"""Helper functions for views that handle object trees."""
2121

22-
2322
from omero.rtypes import unwrap, wrap, rlong
2423
from omero.sys import ParametersI
2524
from . import api_settings
2625

2726
from .api_marshal import marshal_objects
2827
from copy import deepcopy
2928

30-
3129
MAX_LIMIT = max(1, api_settings.API_MAX_LIMIT)
3230
DEFAULT_LIMIT = max(1, api_settings.API_LIMIT)
3331

omeroweb/api/decorators.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
NotFoundError,
3636
)
3737

38-
3938
logger = logging.getLogger(__name__)
4039

4140

omeroweb/testlib/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"""
2121
Library for Web integration tests
2222
"""
23+
2324
import json
2425
import warnings
2526

omeroweb/urls.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,10 @@ def redirect_urlpatterns():
104104
regex = "^%s/" % label
105105
urlpatterns.append(re_path(regex, include(urlmodule)))
106106
except ImportError:
107-
print(
108-
"""Failed to import %s
107+
print("""Failed to import %s
109108
Please check if the app is installed and the versions of the app and
110109
OMERO.web are compatible
111-
"""
112-
% urlmodule
113-
)
110+
""" % urlmodule)
114111
raise
115112
else:
116113
logger.debug("Module not found: %s" % urlmodule)

omeroweb/utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from django.urls import reverse
2828
from django.urls import NoReverseMatch
2929

30-
3130
logger = logging.getLogger(__name__)
3231

3332

omeroweb/webadmin/custom_forms.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
from django.utils.encoding import smart_str
3535
from django.core.validators import validate_email, EMPTY_VALUES
3636

37-
3837
##################################################################
3938
# Fields
4039

omeroweb/webclient/show.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -970,9 +970,7 @@ def paths_to_tag(conn, experimenter_id=None, tagset_id=None, tag_id=None):
970970
left outer join tagset.annotationLinks ttlink
971971
left outer join ttlink.child.details.owner towner
972972
where %s
973-
""" % " and ".join(
974-
where_clause
975-
)
973+
""" % " and ".join(where_clause)
976974

977975
tagsets = qs.projection(q, params, service_opts)
978976
for e in tagsets:
@@ -1004,9 +1002,7 @@ def paths_to_tag(conn, experimenter_id=None, tagset_id=None, tag_id=None):
10041002
from TagAnnotation tag
10051003
left outer join tag.details.owner towner
10061004
where %s
1007-
""" % " and ".join(
1008-
where_clause
1009-
)
1005+
""" % " and ".join(where_clause)
10101006

10111007
tagsets = qs.projection(q, params, service_opts)
10121008
for e in tagsets:

0 commit comments

Comments
 (0)