diff --git a/omero/plugins/web.py b/omero/plugins/web.py index 6dbc3d6a03..d8d2c767ce 100644 --- a/omero/plugins/web.py +++ b/omero/plugins/web.py @@ -1,10 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- """ - Plugin for our configuring the OMERO.web installation +Plugin for our configuring the OMERO.web installation - Copyright 2009-2016 University of Dundee. All rights reserved. - Use is subject to license terms supplied in LICENSE.txt +Copyright 2009-2016 University of Dundee. All rights reserved. +Use is subject to license terms supplied in LICENSE.txt """ diff --git a/omeroweb/feedback/views.py b/omeroweb/feedback/views.py index af926bc5f5..d075f33f15 100644 --- a/omeroweb/feedback/views.py +++ b/omeroweb/feedback/views.py @@ -23,7 +23,7 @@ # Version: 1.0 # -""" A view functions is simply a Python function that takes a Web request and +"""A view functions is simply a Python function that takes a Web request and returns a Web response. This response can be the HTML contents of a Web page, or a redirect, or the 404 and 500 error, or an XML document, or an image... or anything.""" diff --git a/omeroweb/testlib/__init__.py b/omeroweb/testlib/__init__.py index 90eda3cba3..6f962a31bd 100644 --- a/omeroweb/testlib/__init__.py +++ b/omeroweb/testlib/__init__.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ - Library for Web integration tests +Library for Web integration tests """ import json import warnings diff --git a/omeroweb/webadmin/views.py b/omeroweb/webadmin/views.py index 23f03fd1e5..fc16ece7e7 100644 --- a/omeroweb/webadmin/views.py +++ b/omeroweb/webadmin/views.py @@ -24,7 +24,7 @@ # Version: 1.0 # -""" A view functions is simply a Python function that takes a Web request and +"""A view functions is simply a Python function that takes a Web request and returns a Web response. This response can be the HTML contents of a Web page, or a redirect, or the 404 and 500 error, or an XML document, or an image... or anything.""" diff --git a/omeroweb/webclient/tree.py b/omeroweb/webclient/tree.py index beb46de53c..83350a3d8b 100644 --- a/omeroweb/webclient/tree.py +++ b/omeroweb/webclient/tree.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" Helper functions for views that handle object trees """ +"""Helper functions for views that handle object trees""" import logging import time diff --git a/omeroweb/webclient/views.py b/omeroweb/webclient/views.py index 504ce999d3..3b2d9fb78f 100755 --- a/omeroweb/webclient/views.py +++ b/omeroweb/webclient/views.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" A view functions is simply a Python function that takes a Web request and +"""A view functions is simply a Python function that takes a Web request and returns a Web response. This response can be the HTML contents of a Web page, or a redirect, or the 404 and 500 error, or an XML document, or an image... or anything.""" diff --git a/omeroweb/webgateway/plategrid.py b/omeroweb/webgateway/plategrid.py index 9d6e8a966d..3519a0907b 100644 --- a/omeroweb/webgateway/plategrid.py +++ b/omeroweb/webgateway/plategrid.py @@ -6,8 +6,8 @@ # Use is subject to license terms supplied in LICENSE.txt """ - Module to encapsulate operations concerned with displaying the contents of a - plate as a grid. +Module to encapsulate operations concerned with displaying the contents of a +plate as a grid. """ import logging diff --git a/omeroweb/webgateway/templatetags/common_filters.py b/omeroweb/webgateway/templatetags/common_filters.py index 939054007d..d07d3426ce 100644 --- a/omeroweb/webgateway/templatetags/common_filters.py +++ b/omeroweb/webgateway/templatetags/common_filters.py @@ -221,13 +221,13 @@ def lengthunit(value): """ if value == 0: - return "\u00B5m" + return "\u00b5m" elif value < 0.001: - return "\u212B" + return "\u212b" elif value < 0.01: return "nm" elif value < 1000: - return "\u00B5m" + return "\u00b5m" elif value < 1000 * 100: return "mm" elif value < 1000 * 100 * 10: @@ -260,21 +260,21 @@ def timeformat(value): return "%s s" % str(value) # Formatting shows integer values for all, so we round() for accuracy if value == 0: - return "%d\u00A0s" % value + return "%d\u00a0s" % value if value < Decimal("0.001"): - return "%d\u00A0\u00B5s" % (round(value * 1000 * 1000)) + return "%d\u00a0\u00b5s" % (round(value * 1000 * 1000)) elif value < 1: - return "%d\u00A0ms" % (round(value * 1000)) + return "%d\u00a0ms" % (round(value * 1000)) elif round(value) < 60: # Round and format seconds to one decimal place value = round(value * 10) / 10 - return "%0.1f\u00A0s" % value + return "%0.1f\u00a0s" % value elif round(value) < 60 * 60: value = round(value) # Avoids '1min 60s' - return "%d\u00A0min\u00A0%d\u00A0s" % (value / 60, value % 60) + return "%d\u00a0min\u00a0%d\u00a0s" % (value / 60, value % 60) else: value = round(value) # Avoids '1h 60min' - return "%d\u00A0h\u00A0%d\u00A0min" % (value / 3600, round((value % 3600) / 60)) + return "%d\u00a0h\u00a0%d\u00a0min" % (value / 3600, round((value % 3600) / 60)) # taken from https://code.djangoproject.com/ticket/17419 diff --git a/omeroweb/webredirect/views.py b/omeroweb/webredirect/views.py index 1319f787d2..1d807dab40 100644 --- a/omeroweb/webredirect/views.py +++ b/omeroweb/webredirect/views.py @@ -23,7 +23,7 @@ # Version: 1.0 # -""" A view functions is simply a Python function that takes a Web request and +"""A view functions is simply a Python function that takes a Web request and returns a Web response. This response can be the HTML contents of a Web page, or a redirect, or the 404 and 500 error, or an XML document, or an image... or anything.""" diff --git a/setup.py b/setup.py index 8c89e6e6ac..4039ff40a9 100755 --- a/setup.py +++ b/setup.py @@ -1,10 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- """ - Copyright 2008-2020 The Open Microscopy Environment, Glencoe Software, Inc. - All rights reserved. +Copyright 2008-2020 The Open Microscopy Environment, Glencoe Software, Inc. +All rights reserved. - Use is subject to license terms supplied in LICENSE.txt +Use is subject to license terms supplied in LICENSE.txt """ diff --git a/test/unit/test_show.py b/test/unit/test_show.py index 888aadadfd..8bddb8bfb5 100644 --- a/test/unit/test_show.py +++ b/test/unit/test_show.py @@ -2,10 +2,10 @@ # -*- coding: utf-8 -*- """ - Simple unit tests for the "show" module. +Simple unit tests for the "show" module. - Copyright 2014 Glencoe Software, Inc. All rights reserved. - Use is subject to license terms supplied in LICENSE.txt +Copyright 2014 Glencoe Software, Inc. All rights reserved. +Use is subject to license terms supplied in LICENSE.txt """