From 77dc7a59acbfbcc0941d93aea2efb66a65d432ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 17 Jan 2024 12:16:54 +0000 Subject: [PATCH] Remove all unnecessary builtins imports --- examples/projection_1.py | 3 +-- manualtests/populate_roi_test.py | 2 -- src/omero/callbacks.py | 1 - src/omero/cli.py | 7 +------ src/omero/clients.py | 3 --- src/omero/columns.py | 3 --- src/omero/config.py | 1 - src/omero/conversions.py | 2 -- src/omero/gateway/__init__.py | 5 ----- src/omero/gateway/scripts/dbhelpers.py | 3 +-- src/omero/gateway/scripts/testdb_create.py | 3 --- src/omero/gateway/utils.py | 2 -- src/omero/hdfstorageV2.py | 5 +---- src/omero/install/config_parser.py | 2 -- src/omero/install/jvmcfg.py | 3 --- src/omero/install/logs_library.py | 1 - src/omero/install/perf_test.py | 3 --- src/omero/install/win_set_path.py | 1 - src/omero/plugins/_metadata_deprecated.py | 3 --- src/omero/plugins/admin.py | 2 -- src/omero/plugins/download.py | 1 - src/omero/plugins/export.py | 1 - src/omero/plugins/fs.py | 4 ---- src/omero/plugins/group.py | 1 - src/omero/plugins/hql.py | 2 -- src/omero/plugins/import.py | 2 -- src/omero/plugins/ldap.py | 1 - src/omero/plugins/node.py | 1 - src/omero/plugins/obj.py | 2 -- src/omero/plugins/prefs.py | 2 -- src/omero/plugins/script.py | 2 -- src/omero/plugins/search.py | 1 - src/omero/plugins/sessions.py | 1 - src/omero/plugins/submit.py | 1 - src/omero/plugins/tag.py | 7 +------ src/omero/processor.py | 3 --- src/omero/rtypes.py | 1 - src/omero/tables.py | 2 -- src/omero/testlib/__init__.py | 3 --- src/omero/testlib/cli.py | 1 - src/omero/util/OmeroPopo.py | 2 -- src/omero/util/ROIDrawingUtils.py | 1 - src/omero/util/ROI_utils.py | 4 ---- src/omero/util/__init__.py | 2 -- src/omero/util/cleanse.py | 2 -- src/omero/util/decorators.py | 1 - src/omero/util/figureUtil.py | 2 -- src/omero/util/import_candidates.py | 1 - src/omero/util/importperf.py | 2 -- src/omero/util/metadata_mapannotations.py | 3 --- src/omero/util/metadata_utils.py | 2 -- src/omero/util/populate_metadata.py | 5 ----- src/omero/util/populate_roi.py | 3 --- src/omero/util/roi_handling_utils.py | 1 - src/omero/util/script_utils.py | 3 --- src/omero/util/sessions.py | 2 -- src/omero/util/temp_files.py | 3 --- src/omero/util/text.py | 4 ---- src/omero/util/tiles.py | 2 -- src/omero/util/upgrade_check.py | 2 -- src/omero_ext/argparse.py | 5 ----- src/omero_ext/path.py | 7 ------- src/omero_ext/pyinotify.py | 4 ---- src/omero_ext/stubout.py | 1 - src/omero_ext/which.py | 2 -- src/omero_ext/winprocess.py | 1 - src/omero_model_ElectricPotentialI.py | 1 - src/omero_model_FrequencyI.py | 1 - src/omero_model_LengthI.py | 1 - src/omero_model_PowerI.py | 1 - src/omero_model_PressureI.py | 1 - src/omero_model_TemperatureI.py | 1 - src/omero_model_TimeI.py | 1 - src/omero_model_UnitBase.py | 2 -- test/conftest.py | 2 -- test/unit/clitest/test_admin.py | 2 -- test/unit/clitest/test_basics.py | 1 - test/unit/clitest/test_chgrp.py | 1 - test/unit/clitest/test_cli.py | 2 -- test/unit/clitest/test_db.py | 3 --- test/unit/clitest/test_download.py | 1 - test/unit/clitest/test_export.py | 1 - test/unit/clitest/test_fs.py | 1 - test/unit/clitest/test_group.py | 1 - test/unit/clitest/test_hql.py | 1 - test/unit/clitest/test_import.py | 3 --- test/unit/clitest/test_ldap.py | 1 - test/unit/clitest/test_obj.py | 1 - test/unit/clitest/test_prefs.py | 2 -- test/unit/clitest/test_rcode.py | 1 - test/unit/clitest/test_script.py | 1 - test/unit/clitest/test_sess.py | 2 -- test/unit/clitest/test_sessions.py | 2 -- test/unit/clitest/test_tag.py | 1 - test/unit/clitest/test_user.py | 1 - test/unit/fstest/test_model.py | 1 - test/unit/gatewaytest/test_argument_errors.py | 2 -- test/unit/gatewaytest/test_build_query.py | 1 - test/unit/gatewaytest/test_utils.py | 3 --- test/unit/scriptstest/test_parse.py | 2 -- test/unit/scriptstest/test_processor.py | 2 -- test/unit/scriptstest/test_prototypes.py | 2 -- test/unit/tablestest/library.py | 1 - test/unit/tablestest/test_hdfstorage.py | 2 -- test/unit/tablestest/test_servants.py | 3 --- test/unit/test_clients.py | 1 - test/unit/test_config.py | 2 -- test/unit/test_conversions.py | 2 -- test/unit/test_gateway.py | 1 - test/unit/test_jvmcfg.py | 2 -- test/unit/test_metadata_mapannotations.py | 2 -- test/unit/test_metadata_utils.py | 1 - test/unit/test_model.py | 3 --- test/unit/test_parameters.py | 1 - test/unit/test_path.py | 1 - test/unit/test_permissions.py | 2 -- test/unit/test_python_only.py | 1 - test/unit/test_rois.py | 1 - test/unit/test_rtypes.py | 2 -- test/unit/test_tempfiles.py | 2 -- test/unit/test_util.py | 3 --- 121 files changed, 5 insertions(+), 242 deletions(-) mode change 100644 => 100755 src/omero/rtypes.py diff --git a/examples/projection_1.py b/examples/projection_1.py index b4a1a3cee..412adae35 100644 --- a/examples/projection_1.py +++ b/examples/projection_1.py @@ -33,8 +33,7 @@ # @param method the method of projecting (maximum, average) # @return new pixels object containing the projection. # -from builtins import range -from builtins import object + import sys import omero import omero.cli diff --git a/manualtests/populate_roi_test.py b/manualtests/populate_roi_test.py index 2e6c2a71e..16d39aa46 100644 --- a/manualtests/populate_roi_test.py +++ b/manualtests/populate_roi_test.py @@ -23,8 +23,6 @@ # -from builtins import range -from builtins import object import unittest import os diff --git a/src/omero/callbacks.py b/src/omero/callbacks.py index c467a04bc..09e1105da 100644 --- a/src/omero/callbacks.py +++ b/src/omero/callbacks.py @@ -14,7 +14,6 @@ module for backwards compatibility. """ -from builtins import str import Ice import logging import threading diff --git a/src/omero/cli.py b/src/omero/cli.py index 34fe1af2d..91eae68ab 100755 --- a/src/omero/cli.py +++ b/src/omero/cli.py @@ -22,12 +22,7 @@ ``cmd.Cmd.cmdloop`` method. """ -from builtins import zip -from builtins import input -from builtins import map -from builtins import str -from builtins import range -from builtins import object + sys = __import__("sys") cmd = __import__("cmd") diff --git a/src/omero/clients.py b/src/omero/clients.py index 8413300b3..7f1d3e1ea 100755 --- a/src/omero/clients.py +++ b/src/omero/clients.py @@ -7,9 +7,6 @@ # # -from builtins import zip -from builtins import range -from builtins import object __save__ = __name__ __name__ = 'omero' try: diff --git a/src/omero/columns.py b/src/omero/columns.py index 542441fdc..69c2d52a3 100644 --- a/src/omero/columns.py +++ b/src/omero/columns.py @@ -11,9 +11,6 @@ to PyTables types. """ -from builtins import zip -from builtins import range -from builtins import object import omero import Ice import IceImport diff --git a/src/omero/config.py b/src/omero/config.py index 98766f7ed..41a258bd3 100644 --- a/src/omero/config.py +++ b/src/omero/config.py @@ -12,7 +12,6 @@ see ticket:2213 - Replacing Java Preferences API """ -from builtins import object, str import os import time import logging diff --git a/src/omero/conversions.py b/src/omero/conversions.py index 9bb81666d..383d5b432 100644 --- a/src/omero/conversions.py +++ b/src/omero/conversions.py @@ -23,8 +23,6 @@ Conversion utilities for changing between units. """ -from builtins import str -from builtins import object class Conversion(object): """ Base-functor like object which can be used for preparing complex diff --git a/src/omero/gateway/__init__.py b/src/omero/gateway/__init__.py index 6e8cbbcdb..9035d93c5 100644 --- a/src/omero/gateway/__init__.py +++ b/src/omero/gateway/__init__.py @@ -12,11 +12,6 @@ # jason@glencoesoftware.com. # Set up the python include paths -from builtins import chr -from builtins import map -from builtins import str -from builtins import range -from builtins import object import os import warnings diff --git a/src/omero/gateway/scripts/dbhelpers.py b/src/omero/gateway/scripts/dbhelpers.py index e6d80865c..a4d6c0ecd 100644 --- a/src/omero/gateway/scripts/dbhelpers.py +++ b/src/omero/gateway/scripts/dbhelpers.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from builtins import str -from builtins import object + import sys sys.path.append('.') diff --git a/src/omero/gateway/scripts/testdb_create.py b/src/omero/gateway/scripts/testdb_create.py index 43dc0e9d9..8137494d7 100644 --- a/src/omero/gateway/scripts/testdb_create.py +++ b/src/omero/gateway/scripts/testdb_create.py @@ -9,9 +9,6 @@ Library for gateway tests """ -from builtins import str -from builtins import range -from builtins import object from io import StringIO from io import BytesIO import omero diff --git a/src/omero/gateway/utils.py b/src/omero/gateway/utils.py index 8b95c30a9..b22c735a2 100644 --- a/src/omero/gateway/utils.py +++ b/src/omero/gateway/utils.py @@ -23,8 +23,6 @@ # Version: 1.0 # -from builtins import str -from builtins import object import logging import json diff --git a/src/omero/hdfstorageV2.py b/src/omero/hdfstorageV2.py index 78b864e63..f93dee2a7 100755 --- a/src/omero/hdfstorageV2.py +++ b/src/omero/hdfstorageV2.py @@ -9,10 +9,7 @@ """ OMERO HdfStorage Interface """ -from builtins import str -from builtins import zip -from builtins import range -from builtins import object + import time import numpy import logging diff --git a/src/omero/install/config_parser.py b/src/omero/install/config_parser.py index 6a2ff6032..750ce5035 100755 --- a/src/omero/install/config_parser.py +++ b/src/omero/install/config_parser.py @@ -24,8 +24,6 @@ mark up. """ -from builtins import str -from builtins import object class Header(object): def __init__(self, name, reference=None, description=""): """Initialize new configuration property""" diff --git a/src/omero/install/jvmcfg.py b/src/omero/install/jvmcfg.py index ea0282a51..3e22eaeb5 100755 --- a/src/omero/install/jvmcfg.py +++ b/src/omero/install/jvmcfg.py @@ -23,9 +23,6 @@ Automatic configuration of memory settings for Java servers. """ -from builtins import str -from builtins import range -from builtins import object from shlex import split import logging diff --git a/src/omero/install/logs_library.py b/src/omero/install/logs_library.py index d43f4002a..40a1c21f1 100755 --- a/src/omero/install/logs_library.py +++ b/src/omero/install/logs_library.py @@ -13,7 +13,6 @@ omero.util.configure_logging. """ -from builtins import object import numpy as np import matplotlib.pyplot as plt import matplotlib.lines as lines diff --git a/src/omero/install/perf_test.py b/src/omero/install/perf_test.py index 5d0fc66b5..4eadec195 100755 --- a/src/omero/install/perf_test.py +++ b/src/omero/install/perf_test.py @@ -6,9 +6,6 @@ # Add: plotting # -from builtins import str -from builtins import range -from builtins import object import re import os import sys diff --git a/src/omero/install/win_set_path.py b/src/omero/install/win_set_path.py index 43a84c90d..10f27a93a 100755 --- a/src/omero/install/win_set_path.py +++ b/src/omero/install/win_set_path.py @@ -12,7 +12,6 @@ are not supported. """ -from builtins import str import sys from omero_ext.path import path import fileinput diff --git a/src/omero/plugins/_metadata_deprecated.py b/src/omero/plugins/_metadata_deprecated.py index d00512e8a..5fe3f5dab 100755 --- a/src/omero/plugins/_metadata_deprecated.py +++ b/src/omero/plugins/_metadata_deprecated.py @@ -9,9 +9,6 @@ Metadata plugin """ -from builtins import str -from builtins import range -from builtins import object import logging import mimetypes import os diff --git a/src/omero/plugins/admin.py b/src/omero/plugins/admin.py index 5344a7dbc..5f1cf36d7 100755 --- a/src/omero/plugins/admin.py +++ b/src/omero/plugins/admin.py @@ -12,8 +12,6 @@ and various other tools needed for administration. """ -from builtins import str -from builtins import object import re import os import sys diff --git a/src/omero/plugins/download.py b/src/omero/plugins/download.py index 789868c79..d92af120a 100755 --- a/src/omero/plugins/download.py +++ b/src/omero/plugins/download.py @@ -12,7 +12,6 @@ defined here will be added to the Cli class for later use. """ -from builtins import str import sys import omero import os diff --git a/src/omero/plugins/export.py b/src/omero/plugins/export.py index 00e50a76b..014c49999 100644 --- a/src/omero/plugins/export.py +++ b/src/omero/plugins/export.py @@ -9,7 +9,6 @@ Startup plugin for command-line exporter """ -from builtins import str import os import sys diff --git a/src/omero/plugins/fs.py b/src/omero/plugins/fs.py index 991228253..957b15f45 100755 --- a/src/omero/plugins/fs.py +++ b/src/omero/plugins/fs.py @@ -23,10 +23,6 @@ fs plugin for querying repositories, filesets, and the like. """ -from builtins import zip -from builtins import str -from builtins import map -from builtins import object import platform import sys diff --git a/src/omero/plugins/group.py b/src/omero/plugins/group.py index 6db46777c..c2a6d2b96 100755 --- a/src/omero/plugins/group.py +++ b/src/omero/plugins/group.py @@ -9,7 +9,6 @@ Group administration plugin """ -from builtins import str import sys from omero.cli import UserGroupControl, CLI, ExceptionHandler, admin_only diff --git a/src/omero/plugins/hql.py b/src/omero/plugins/hql.py index 20d486c34..d85c0e4fd 100755 --- a/src/omero/plugins/hql.py +++ b/src/omero/plugins/hql.py @@ -12,8 +12,6 @@ defined here will be added to the Cli class for later use. """ -from builtins import str -from builtins import range from omero.cli import BaseControl, CLI import time import sys diff --git a/src/omero/plugins/import.py b/src/omero/plugins/import.py index 8ffe12b23..a296950f7 100644 --- a/src/omero/plugins/import.py +++ b/src/omero/plugins/import.py @@ -24,8 +24,6 @@ """ -from builtins import str -from builtins import object from io import BytesIO import os import csv diff --git a/src/omero/plugins/ldap.py b/src/omero/plugins/ldap.py index 4310b7926..7b71b5df9 100644 --- a/src/omero/plugins/ldap.py +++ b/src/omero/plugins/ldap.py @@ -10,7 +10,6 @@ User administration plugin (LDAP extension) """ -from builtins import str import sys from omero.cli import CLI, ExceptionHandler, admin_only, UserGroupControl diff --git a/src/omero/plugins/node.py b/src/omero/plugins/node.py index bb9bf1d55..8578b6208 100755 --- a/src/omero/plugins/node.py +++ b/src/omero/plugins/node.py @@ -12,7 +12,6 @@ This is a python wrapper around icegridnode. """ -from builtins import str from omero.cli import BaseControl, CLI, NonZeroReturnCode from omero.util import tail_lines import os diff --git a/src/omero/plugins/obj.py b/src/omero/plugins/obj.py index e9fd44226..db0e3eed5 100755 --- a/src/omero/plugins/obj.py +++ b/src/omero/plugins/obj.py @@ -27,8 +27,6 @@ """ -from builtins import str -from builtins import object import re import sys import shlex diff --git a/src/omero/plugins/prefs.py b/src/omero/plugins/prefs.py index 495342a67..e084dd3e4 100755 --- a/src/omero/plugins/prefs.py +++ b/src/omero/plugins/prefs.py @@ -12,8 +12,6 @@ The pref plugin makes use of prefs.class from the common component. """ -from builtins import zip -from builtins import str import sys import traceback import os diff --git a/src/omero/plugins/script.py b/src/omero/plugins/script.py index 9c1e49833..2521fa1d9 100755 --- a/src/omero/plugins/script.py +++ b/src/omero/plugins/script.py @@ -19,8 +19,6 @@ on a given platform i.e. invokable by subprocess.call([file,...]) """ -from builtins import str -from builtins import object import re import os import sys diff --git a/src/omero/plugins/search.py b/src/omero/plugins/search.py index 53c031a51..289dbc39b 100755 --- a/src/omero/plugins/search.py +++ b/src/omero/plugins/search.py @@ -11,7 +11,6 @@ """ -from builtins import str import sys import time diff --git a/src/omero/plugins/sessions.py b/src/omero/plugins/sessions.py index fde822cc9..371d7fe0f 100644 --- a/src/omero/plugins/sessions.py +++ b/src/omero/plugins/sessions.py @@ -25,7 +25,6 @@ defined here will be added to the Cli class for later use. """ -from builtins import str import datetime import os import sys diff --git a/src/omero/plugins/submit.py b/src/omero/plugins/submit.py index f97b71523..c9b06b282 100755 --- a/src/omero/plugins/submit.py +++ b/src/omero/plugins/submit.py @@ -12,7 +12,6 @@ defined here will be added to the Cli class for later use. """ -from builtins import str from omero.cli import BaseControl, CLI import sys diff --git a/src/omero/plugins/tag.py b/src/omero/plugins/tag.py index 01f6b15b0..abbfd256d 100644 --- a/src/omero/plugins/tag.py +++ b/src/omero/plugins/tag.py @@ -10,11 +10,6 @@ Tag plugin for command-line tag manipulation """ -from builtins import input -from builtins import map -from builtins import str -from builtins import object -import builtins import platform import subprocess import sys @@ -517,7 +512,7 @@ def create_tag(self, name, description, text="tag"): (the default). If we were creating a tagset, this could be "tag set". """ if name is None: - name = builtins.input("Please enter a name for this %s: " % text) + name = input("Please enter a name for this %s: " % text) if name is not None and name != '': tag = TagAnnotationI() diff --git a/src/omero/processor.py b/src/omero/processor.py index 3a1738cc8..7e93b7981 100755 --- a/src/omero/processor.py +++ b/src/omero/processor.py @@ -9,9 +9,6 @@ OMERO Grid Processor """ -from builtins import str -from builtins import range -from builtins import object import os import time import signal diff --git a/src/omero/rtypes.py b/src/omero/rtypes.py old mode 100644 new mode 100755 index 65b41c86f..5b729810c --- a/src/omero/rtypes.py +++ b/src/omero/rtypes.py @@ -16,7 +16,6 @@ omero.rtypes as well as the omero/rtypes.{h,cpp} files. """ -from builtins import str import omero import Ice import IceImport diff --git a/src/omero/tables.py b/src/omero/tables.py index 2b99bd570..d37a4c58e 100644 --- a/src/omero/tables.py +++ b/src/omero/tables.py @@ -8,8 +8,6 @@ """ OMERO Grid Processor """ -from builtins import str -from builtins import range import Ice import time import traceback diff --git a/src/omero/testlib/__init__.py b/src/omero/testlib/__init__.py index a3bd559e1..cee6e6207 100644 --- a/src/omero/testlib/__init__.py +++ b/src/omero/testlib/__init__.py @@ -24,9 +24,6 @@ """ -from builtins import str -from builtins import range -from builtins import object import os import platform import locale diff --git a/src/omero/testlib/cli.py b/src/omero/testlib/cli.py index 5d13057ce..54ab1eed0 100644 --- a/src/omero/testlib/cli.py +++ b/src/omero/testlib/cli.py @@ -20,7 +20,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object import pytest import omero diff --git a/src/omero/util/OmeroPopo.py b/src/omero/util/OmeroPopo.py index a3ca4ba70..34d5e9cc2 100644 --- a/src/omero/util/OmeroPopo.py +++ b/src/omero/util/OmeroPopo.py @@ -19,8 +19,6 @@ # @author Donald MacDonald      # donald@lifesci.dundee.ac.uk -from builtins import range -from builtins import object import math import numpy diff --git a/src/omero/util/ROIDrawingUtils.py b/src/omero/util/ROIDrawingUtils.py index 76eeafc2e..87d9cef26 100644 --- a/src/omero/util/ROIDrawingUtils.py +++ b/src/omero/util/ROIDrawingUtils.py @@ -72,7 +72,6 @@ """ -from builtins import object try: from PIL import Image, ImageDraw # see ticket:2597 except ImportError: diff --git a/src/omero/util/ROI_utils.py b/src/omero/util/ROI_utils.py index 1ca1cc92f..b3659648f 100644 --- a/src/omero/util/ROI_utils.py +++ b/src/omero/util/ROI_utils.py @@ -35,10 +35,6 @@ the ROIDrawingCanvas. """ -from builtins import str -from builtins import map -from builtins import range -from builtins import object from omero.model.enums import UnitsLength from omero.model import LengthI from omero.model import EllipseI diff --git a/src/omero/util/__init__.py b/src/omero/util/__init__.py index 507edc75c..be9ff6c9e 100644 --- a/src/omero/util/__init__.py +++ b/src/omero/util/__init__.py @@ -7,8 +7,6 @@ # Use is subject to license terms supplied in LICENSE.txt # -from builtins import str -from builtins import object from appdirs import user_data_dir, user_cache_dir import os import sys diff --git a/src/omero/util/cleanse.py b/src/omero/util/cleanse.py index 4bcbd6f06..237cb7f35 100644 --- a/src/omero/util/cleanse.py +++ b/src/omero/util/cleanse.py @@ -28,8 +28,6 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -from builtins import range -from builtins import object import omero.clients import omero import sys diff --git a/src/omero/util/decorators.py b/src/omero/util/decorators.py index fbebc4db0..fbc0807c2 100644 --- a/src/omero/util/decorators.py +++ b/src/omero/util/decorators.py @@ -9,7 +9,6 @@ """ OMERO Decorators """ -from builtins import object import time import logging import traceback diff --git a/src/omero/util/figureUtil.py b/src/omero/util/figureUtil.py index 77ce1bb0a..b738611c6 100755 --- a/src/omero/util/figureUtil.py +++ b/src/omero/util/figureUtil.py @@ -29,8 +29,6 @@ publication type of figures. """ -from builtins import str -from builtins import range try: from PIL import Image, ImageDraw # see ticket:2597 except ImportError: diff --git a/src/omero/util/import_candidates.py b/src/omero/util/import_candidates.py index 414d532ec..6b410aa45 100644 --- a/src/omero/util/import_candidates.py +++ b/src/omero/util/import_candidates.py @@ -12,7 +12,6 @@ """ -from builtins import str import omero from omero.util.temp_files import create_path, remove_path diff --git a/src/omero/util/importperf.py b/src/omero/util/importperf.py index 505f16072..5a11bc391 100755 --- a/src/omero/util/importperf.py +++ b/src/omero/util/importperf.py @@ -22,8 +22,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -from builtins import str -from builtins import object import re import sys diff --git a/src/omero/util/metadata_mapannotations.py b/src/omero/util/metadata_mapannotations.py index d4c3cda5b..443c3112e 100644 --- a/src/omero/util/metadata_mapannotations.py +++ b/src/omero/util/metadata_mapannotations.py @@ -23,9 +23,6 @@ Utilities for manipulating map-annotations used as metadata """ -from builtins import str -from builtins import range -from builtins import object import logging from omero.model import NamedValue from omero.rtypes import rstring, unwrap diff --git a/src/omero/util/metadata_utils.py b/src/omero/util/metadata_utils.py index 35d4b3cdd..6cee0da9d 100644 --- a/src/omero/util/metadata_utils.py +++ b/src/omero/util/metadata_utils.py @@ -26,8 +26,6 @@ data for clients. """ -from builtins import range -from builtins import object from collections import deque, OrderedDict from omero.constants import namespaces import re diff --git a/src/omero/util/populate_metadata.py b/src/omero/util/populate_metadata.py index 608c9fca3..c2a65c9ec 100644 --- a/src/omero/util/populate_metadata.py +++ b/src/omero/util/populate_metadata.py @@ -23,11 +23,6 @@ # -from builtins import zip -from builtins import chr -from builtins import str -from builtins import range -from builtins import object import logging import gzip import sys diff --git a/src/omero/util/populate_roi.py b/src/omero/util/populate_roi.py index 549ba4013..82ab62e69 100644 --- a/src/omero/util/populate_roi.py +++ b/src/omero/util/populate_roi.py @@ -23,9 +23,6 @@ # -from builtins import str -from builtins import range -from builtins import object import tempfile import logging import time diff --git a/src/omero/util/roi_handling_utils.py b/src/omero/util/roi_handling_utils.py index 8efab3273..2e737eba8 100644 --- a/src/omero/util/roi_handling_utils.py +++ b/src/omero/util/roi_handling_utils.py @@ -22,7 +22,6 @@ Utility methods for manipulating roi. """ -from builtins import map from numpy import asarray, int32, zeros, hstack, vstack import omero.util.script_utils as script_utils import math diff --git a/src/omero/util/script_utils.py b/src/omero/util/script_utils.py index 0f6411c9f..6878488f2 100644 --- a/src/omero/util/script_utils.py +++ b/src/omero/util/script_utils.py @@ -22,9 +22,6 @@ Utility methods for dealing with scripts. """ -from builtins import hex -from builtins import str -from builtins import range import logging import os import warnings diff --git a/src/omero/util/sessions.py b/src/omero/util/sessions.py index 307878e4c..d84170035 100644 --- a/src/omero/util/sessions.py +++ b/src/omero/util/sessions.py @@ -23,8 +23,6 @@ Library for managing user sessions. """ -from builtins import str -from builtins import object import omero.constants from omero.util import get_omero_userdir, make_logname from omero.rtypes import rlong diff --git a/src/omero/util/temp_files.py b/src/omero/util/temp_files.py index b1c804f14..efde0313f 100644 --- a/src/omero/util/temp_files.py +++ b/src/omero/util/temp_files.py @@ -8,9 +8,6 @@ OMERO Support for temporary files and directories """ -from builtins import input -from builtins import str -from builtins import object import os import sys import atexit diff --git a/src/omero/util/text.py b/src/omero/util/text.py index 0d32bc7f0..249c8ca81 100644 --- a/src/omero/util/text.py +++ b/src/omero/util/text.py @@ -11,10 +11,6 @@ # The following classes (ALIGN, Column, Table) were originally from # http://code.activestate.com/recipes/577202-render-tables-for-text-interface/ # -from builtins import str -from builtins import zip -from builtins import range -from builtins import object import json import os import sys diff --git a/src/omero/util/tiles.py b/src/omero/util/tiles.py index 0a0f16acd..b2dd09d0e 100644 --- a/src/omero/util/tiles.py +++ b/src/omero/util/tiles.py @@ -4,8 +4,6 @@ # Copyright 2011 Glencoe Software, Inc. All rights reserved. # Use is subject to license terms supplied in LICENSE.txt -from builtins import range -from builtins import object class TileLoopIteration(object): """ "Interface" which must be passed to forEachTile diff --git a/src/omero/util/upgrade_check.py b/src/omero/util/upgrade_check.py index 5e04b04bd..356c2f118 100644 --- a/src/omero/util/upgrade_check.py +++ b/src/omero/util/upgrade_check.py @@ -5,8 +5,6 @@ # Copyright 2009 Glencoe Software, Inc. All rights reserved. # Use is subject to license terms supplied in LICENSE.txt -from builtins import str -from builtins import object from omero_version import omero_version import platform diff --git a/src/omero_ext/argparse.py b/src/omero_ext/argparse.py index 29c95bbc1..eff508409 100644 --- a/src/omero_ext/argparse.py +++ b/src/omero_ext/argparse.py @@ -76,11 +76,6 @@ still considered an implementation detail.) """ -from builtins import zip -from builtins import map -from builtins import str -from builtins import range -from builtins import object __version__ = '1.1' __all__ = [ 'ArgumentParser', diff --git a/src/omero_ext/path.py b/src/omero_ext/path.py index 244f9bfca..f4b7cbc13 100644 --- a/src/omero_ext/path.py +++ b/src/omero_ext/path.py @@ -41,13 +41,6 @@ * Added parpath (2009/09/21) """ -from builtins import zip -from builtins import chr -from builtins import map -from builtins import str -from builtins import bytes -from builtins import object - import sys import warnings import os diff --git a/src/omero_ext/pyinotify.py b/src/omero_ext/pyinotify.py index f45ec918f..e2d7669ab 100755 --- a/src/omero_ext/pyinotify.py +++ b/src/omero_ext/pyinotify.py @@ -29,10 +29,6 @@ @contact: seb@dbzteam.org """ -from builtins import map -from builtins import hex -from builtins import str -from builtins import object class PyinotifyError(Exception): """Indicates exceptions raised by a Pyinotify class.""" pass diff --git a/src/omero_ext/stubout.py b/src/omero_ext/stubout.py index 38a8ced48..a47921427 100644 --- a/src/omero_ext/stubout.py +++ b/src/omero_ext/stubout.py @@ -15,7 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from builtins import object import inspect diff --git a/src/omero_ext/which.py b/src/omero_ext/which.py index 4695673a4..4a35800e8 100644 --- a/src/omero_ext/which.py +++ b/src/omero_ext/which.py @@ -34,8 +34,6 @@ from HKLM\SOFTWARE\...\perl.exe """ -from builtins import map -from builtins import range _cmdlnUsage = """ Show the full path of commands. diff --git a/src/omero_ext/winprocess.py b/src/omero_ext/winprocess.py index 3be253f3b..bf95ccd7c 100644 --- a/src/omero_ext/winprocess.py +++ b/src/omero_ext/winprocess.py @@ -29,7 +29,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -from builtins import object from ctypes import c_void_p, POINTER, sizeof, Structure, windll, WinError, WINFUNCTYPE from ctypes.wintypes import BOOL, BYTE, DWORD, HANDLE, LPCWSTR, LPWSTR, UINT, WORD diff --git a/src/omero_model_ElectricPotentialI.py b/src/omero_model_ElectricPotentialI.py index cee98c40f..c1b68a214 100644 --- a/src/omero_model_ElectricPotentialI.py +++ b/src/omero_model_ElectricPotentialI.py @@ -25,7 +25,6 @@ """ -from builtins import str import Ice import IceImport IceImport.load("omero_model_ElectricPotential_ice") diff --git a/src/omero_model_FrequencyI.py b/src/omero_model_FrequencyI.py index 6c1dc2bfc..ddf35cd76 100644 --- a/src/omero_model_FrequencyI.py +++ b/src/omero_model_FrequencyI.py @@ -25,7 +25,6 @@ """ -from builtins import str import Ice import IceImport IceImport.load("omero_model_Frequency_ice") diff --git a/src/omero_model_LengthI.py b/src/omero_model_LengthI.py index 56f2ff1cb..f1aa986ff 100644 --- a/src/omero_model_LengthI.py +++ b/src/omero_model_LengthI.py @@ -25,7 +25,6 @@ """ -from builtins import str import Ice import IceImport IceImport.load("omero_model_Length_ice") diff --git a/src/omero_model_PowerI.py b/src/omero_model_PowerI.py index f62e63db8..447bd6cb2 100644 --- a/src/omero_model_PowerI.py +++ b/src/omero_model_PowerI.py @@ -25,7 +25,6 @@ """ -from builtins import str import Ice import IceImport IceImport.load("omero_model_Power_ice") diff --git a/src/omero_model_PressureI.py b/src/omero_model_PressureI.py index 360594724..e8f8092ec 100644 --- a/src/omero_model_PressureI.py +++ b/src/omero_model_PressureI.py @@ -25,7 +25,6 @@ """ -from builtins import str import Ice import IceImport IceImport.load("omero_model_Pressure_ice") diff --git a/src/omero_model_TemperatureI.py b/src/omero_model_TemperatureI.py index a1c3af8ee..b30c0a116 100644 --- a/src/omero_model_TemperatureI.py +++ b/src/omero_model_TemperatureI.py @@ -25,7 +25,6 @@ """ -from builtins import str import Ice import IceImport IceImport.load("omero_model_Temperature_ice") diff --git a/src/omero_model_TimeI.py b/src/omero_model_TimeI.py index b4ec77b79..d0a2cee2f 100644 --- a/src/omero_model_TimeI.py +++ b/src/omero_model_TimeI.py @@ -25,7 +25,6 @@ """ -from builtins import str import Ice import IceImport IceImport.load("omero_model_Time_ice") diff --git a/src/omero_model_UnitBase.py b/src/omero_model_UnitBase.py index e69d0fdcb..f1f2acf51 100644 --- a/src/omero_model_UnitBase.py +++ b/src/omero_model_UnitBase.py @@ -25,8 +25,6 @@ """ -from builtins import str -from builtins import object class UnitBase(object): def _base_string(self, v, u): diff --git a/test/conftest.py b/test/conftest.py index e24487220..f8e393f8a 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -5,8 +5,6 @@ # how-can-i-repeat-each-test-multiple-times-in-a-py-test-run # -from builtins import range -from builtins import object import os import pytest diff --git a/test/unit/clitest/test_admin.py b/test/unit/clitest/test_admin.py index 567bc83fa..17cacc029 100644 --- a/test/unit/clitest/test_admin.py +++ b/test/unit/clitest/test_admin.py @@ -9,8 +9,6 @@ """ -from builtins import object - import warnings with warnings.catch_warnings(): diff --git a/test/unit/clitest/test_basics.py b/test/unit/clitest/test_basics.py index 9cd12eb27..32b4e470a 100644 --- a/test/unit/clitest/test_basics.py +++ b/test/unit/clitest/test_basics.py @@ -20,7 +20,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object import pytest from omero.cli import CLI diff --git a/test/unit/clitest/test_chgrp.py b/test/unit/clitest/test_chgrp.py index ff5ba400e..62166a712 100644 --- a/test/unit/clitest/test_chgrp.py +++ b/test/unit/clitest/test_chgrp.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object from omero.cli import CLI from omero.plugins.chgrp import ChgrpControl diff --git a/test/unit/clitest/test_cli.py b/test/unit/clitest/test_cli.py index 1fb62d893..41e24dbc3 100644 --- a/test/unit/clitest/test_cli.py +++ b/test/unit/clitest/test_cli.py @@ -9,8 +9,6 @@ """ -from builtins import range -from builtins import object import pytest from omero.cli import CLI, NonZeroReturnCode diff --git a/test/unit/clitest/test_db.py b/test/unit/clitest/test_db.py index 50428b2ee..3e96b1265 100644 --- a/test/unit/clitest/test_db.py +++ b/test/unit/clitest/test_db.py @@ -9,8 +9,6 @@ """ -from builtins import str -from builtins import object import pytest import os from omero_ext.path import path @@ -19,7 +17,6 @@ from omero.cli import NonZeroReturnCode from omero.cli import CLI import getpass -import builtins OMERODIR = False if 'OMERODIR' in os.environ: diff --git a/test/unit/clitest/test_download.py b/test/unit/clitest/test_download.py index 172e5921c..bd6dfef3d 100644 --- a/test/unit/clitest/test_download.py +++ b/test/unit/clitest/test_download.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object import pytest from omero.plugins.download import DownloadControl from omero.cli import CLI, NonZeroReturnCode diff --git a/test/unit/clitest/test_export.py b/test/unit/clitest/test_export.py index 3b55aff94..3748f8125 100644 --- a/test/unit/clitest/test_export.py +++ b/test/unit/clitest/test_export.py @@ -9,7 +9,6 @@ """ -from builtins import object import os from omero_ext.path import path from omero.cli import CLI, NonZeroReturnCode diff --git a/test/unit/clitest/test_fs.py b/test/unit/clitest/test_fs.py index eaf482d75..7b50f9e9c 100644 --- a/test/unit/clitest/test_fs.py +++ b/test/unit/clitest/test_fs.py @@ -20,7 +20,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object import pytest from omero.cli import CLI from omero.plugins.fs import FsControl diff --git a/test/unit/clitest/test_group.py b/test/unit/clitest/test_group.py index 40328dbba..b7772c246 100644 --- a/test/unit/clitest/test_group.py +++ b/test/unit/clitest/test_group.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object import pytest from omero.plugins.group import GroupControl from omero.cli import CLI diff --git a/test/unit/clitest/test_hql.py b/test/unit/clitest/test_hql.py index de3f40dac..e51dd5a31 100644 --- a/test/unit/clitest/test_hql.py +++ b/test/unit/clitest/test_hql.py @@ -20,7 +20,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object import pytest from omero.cli import CLI from omero.plugins.hql import HqlControl, BLACKLISTED_KEYS, WHITELISTED_VALUES diff --git a/test/unit/clitest/test_import.py b/test/unit/clitest/test_import.py index d80ecaa1b..c42533211 100644 --- a/test/unit/clitest/test_import.py +++ b/test/unit/clitest/test_import.py @@ -9,9 +9,6 @@ """ -from builtins import str -from builtins import range -from builtins import object import os import pytest import sys diff --git a/test/unit/clitest/test_ldap.py b/test/unit/clitest/test_ldap.py index 718af9fd8..b05dd1b09 100644 --- a/test/unit/clitest/test_ldap.py +++ b/test/unit/clitest/test_ldap.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object from omero.cli import CLI from omero.plugins.ldap import LdapControl import pytest diff --git a/test/unit/clitest/test_obj.py b/test/unit/clitest/test_obj.py index eaf9520af..f4bfb767b 100644 --- a/test/unit/clitest/test_obj.py +++ b/test/unit/clitest/test_obj.py @@ -23,7 +23,6 @@ Test of the omero/plugins/tx.py module """ -from builtins import object import pytest from omero.cli import CLI from omero.model import ProjectI diff --git a/test/unit/clitest/test_prefs.py b/test/unit/clitest/test_prefs.py index 13d410a71..4f727a954 100644 --- a/test/unit/clitest/test_prefs.py +++ b/test/unit/clitest/test_prefs.py @@ -9,8 +9,6 @@ """ -from builtins import str -from builtins import object import pytest import sys from omero.cli import CLI, NonZeroReturnCode diff --git a/test/unit/clitest/test_rcode.py b/test/unit/clitest/test_rcode.py index bd670ebc3..fb108b8eb 100644 --- a/test/unit/clitest/test_rcode.py +++ b/test/unit/clitest/test_rcode.py @@ -9,7 +9,6 @@ """ -from builtins import object import os from omero_ext.path import path from omero.cli import BaseControl, CLI diff --git a/test/unit/clitest/test_script.py b/test/unit/clitest/test_script.py index 59cd5be3b..989decfec 100644 --- a/test/unit/clitest/test_script.py +++ b/test/unit/clitest/test_script.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object from omero.plugins.script import ScriptControl from omero.cli import CLI import pytest diff --git a/test/unit/clitest/test_sess.py b/test/unit/clitest/test_sess.py index 7097c3f7f..82ebb3ef1 100644 --- a/test/unit/clitest/test_sess.py +++ b/test/unit/clitest/test_sess.py @@ -9,8 +9,6 @@ """ -from builtins import str -from builtins import object import os import sys import pytest diff --git a/test/unit/clitest/test_sessions.py b/test/unit/clitest/test_sessions.py index 0d3eb844a..dccd11c78 100644 --- a/test/unit/clitest/test_sessions.py +++ b/test/unit/clitest/test_sessions.py @@ -19,8 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import str -from builtins import object from omero.cli import CLI from omero.plugins.sessions import SessionsControl diff --git a/test/unit/clitest/test_tag.py b/test/unit/clitest/test_tag.py index e7ad3022b..02126df89 100644 --- a/test/unit/clitest/test_tag.py +++ b/test/unit/clitest/test_tag.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object import pytest from omero.cli import CLI, NonZeroReturnCode from omero.plugins.tag import TagControl diff --git a/test/unit/clitest/test_user.py b/test/unit/clitest/test_user.py index ebabeea5a..06ea4e3b7 100644 --- a/test/unit/clitest/test_user.py +++ b/test/unit/clitest/test_user.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from builtins import object from omero.plugins.user import UserControl from omero.cli import CLI import pytest diff --git a/test/unit/fstest/test_model.py b/test/unit/fstest/test_model.py index 456ba1813..ec6218a1f 100644 --- a/test/unit/fstest/test_model.py +++ b/test/unit/fstest/test_model.py @@ -25,7 +25,6 @@ just show creation / linkage scenarios. """ -from builtins import object import time import omero import omero.all diff --git a/test/unit/gatewaytest/test_argument_errors.py b/test/unit/gatewaytest/test_argument_errors.py index b297ce28d..90c2e6d97 100644 --- a/test/unit/gatewaytest/test_argument_errors.py +++ b/test/unit/gatewaytest/test_argument_errors.py @@ -24,8 +24,6 @@ """ -from builtins import str -from builtins import object from omero.gateway import _BlitzGateway import pytest diff --git a/test/unit/gatewaytest/test_build_query.py b/test/unit/gatewaytest/test_build_query.py index 135c58639..b12eeb655 100644 --- a/test/unit/gatewaytest/test_build_query.py +++ b/test/unit/gatewaytest/test_build_query.py @@ -21,7 +21,6 @@ """Gateway tests - buildQuery() as used by conn.getObjects().""" -from builtins import object from omero.gateway import _BlitzGateway, BlitzObjectWrapper, KNOWN_WRAPPERS from omero.sys import Parameters, ParametersI, Filter import pytest diff --git a/test/unit/gatewaytest/test_utils.py b/test/unit/gatewaytest/test_utils.py index 570c64528..550d974bb 100644 --- a/test/unit/gatewaytest/test_utils.py +++ b/test/unit/gatewaytest/test_utils.py @@ -9,9 +9,6 @@ """ -from builtins import str -from builtins import hex -from builtins import object from omero.gateway.utils import ServiceOptsDict from omero.gateway.utils import toBoolean from omero.gateway.utils import propertiesToDict diff --git a/test/unit/scriptstest/test_parse.py b/test/unit/scriptstest/test_parse.py index 422ab0f1c..cc805738e 100644 --- a/test/unit/scriptstest/test_parse.py +++ b/test/unit/scriptstest/test_parse.py @@ -9,8 +9,6 @@ """ -from builtins import str -from builtins import object import pytest from omero_ext.path import path diff --git a/test/unit/scriptstest/test_processor.py b/test/unit/scriptstest/test_processor.py index 74c827ac3..b3841ad2c 100644 --- a/test/unit/scriptstest/test_processor.py +++ b/test/unit/scriptstest/test_processor.py @@ -9,8 +9,6 @@ """ -from builtins import str -from builtins import object import os import sys import logging diff --git a/test/unit/scriptstest/test_prototypes.py b/test/unit/scriptstest/test_prototypes.py index 331123bbc..ea03dd7aa 100644 --- a/test/unit/scriptstest/test_prototypes.py +++ b/test/unit/scriptstest/test_prototypes.py @@ -9,8 +9,6 @@ """ -from builtins import str -from builtins import object import omero from omero.scripts import Long, List, validate_inputs from omero.rtypes import rmap, rint, rlong, rstring, rlist, rset, unwrap diff --git a/test/unit/tablestest/library.py b/test/unit/tablestest/library.py index 0f3527fb4..b6441c65c 100755 --- a/test/unit/tablestest/library.py +++ b/test/unit/tablestest/library.py @@ -10,7 +10,6 @@ """ -from builtins import object from omero.util.temp_files import create_path diff --git a/test/unit/tablestest/test_hdfstorage.py b/test/unit/tablestest/test_hdfstorage.py index 519fe2f85..4950c65df 100755 --- a/test/unit/tablestest/test_hdfstorage.py +++ b/test/unit/tablestest/test_hdfstorage.py @@ -9,8 +9,6 @@ """ -from builtins import str -from builtins import object import time import pytest import omero.columns diff --git a/test/unit/tablestest/test_servants.py b/test/unit/tablestest/test_servants.py index 89f408433..3d3621b33 100755 --- a/test/unit/tablestest/test_servants.py +++ b/test/unit/tablestest/test_servants.py @@ -9,9 +9,6 @@ """ -from builtins import str -from builtins import range -from builtins import object import pytest import Ice import omero diff --git a/test/unit/test_clients.py b/test/unit/test_clients.py index c6c8a93aa..c729b120e 100644 --- a/test/unit/test_clients.py +++ b/test/unit/test_clients.py @@ -18,7 +18,6 @@ */ """ -from builtins import object import pytest import Ice import logging diff --git a/test/unit/test_config.py b/test/unit/test_config.py index bd5afa888..4d29f6198 100755 --- a/test/unit/test_config.py +++ b/test/unit/test_config.py @@ -9,8 +9,6 @@ */ """ -from builtins import str -from builtins import object import os import sys import json diff --git a/test/unit/test_conversions.py b/test/unit/test_conversions.py index 22422184f..5d8c68a1f 100644 --- a/test/unit/test_conversions.py +++ b/test/unit/test_conversions.py @@ -23,8 +23,6 @@ Simple tests of the new conversions used for units. """ -from builtins import str -from builtins import object from pytest import assertAlmostEqual from omero.conversions import Add from omero.conversions import Int diff --git a/test/unit/test_gateway.py b/test/unit/test_gateway.py index 32258f2c7..7e1839b19 100644 --- a/test/unit/test_gateway.py +++ b/test/unit/test_gateway.py @@ -24,7 +24,6 @@ Test of various things under omero.gateway """ -from builtins import object import Ice import pytest import sys diff --git a/test/unit/test_jvmcfg.py b/test/unit/test_jvmcfg.py index 83a675162..81cd41438 100644 --- a/test/unit/test_jvmcfg.py +++ b/test/unit/test_jvmcfg.py @@ -23,8 +23,6 @@ Test of the automatic JVM setting logic for OMERO startup. """ -from builtins import str -from builtins import object import pytest import os diff --git a/test/unit/test_metadata_mapannotations.py b/test/unit/test_metadata_mapannotations.py index 66846d78b..45eba1253 100644 --- a/test/unit/test_metadata_mapannotations.py +++ b/test/unit/test_metadata_mapannotations.py @@ -24,8 +24,6 @@ """ -from builtins import str -from builtins import object import pytest from omero.model import MapAnnotationI, NamedValue diff --git a/test/unit/test_metadata_utils.py b/test/unit/test_metadata_utils.py index b6f8e4445..985ba3aa3 100644 --- a/test/unit/test_metadata_utils.py +++ b/test/unit/test_metadata_utils.py @@ -23,7 +23,6 @@ Test of metadata_utils classes """ -from builtins import object import pytest from omero.util.metadata_utils import ( diff --git a/test/unit/test_model.py b/test/unit/test_model.py index 060d41b10..a6d60192a 100644 --- a/test/unit/test_model.py +++ b/test/unit/test_model.py @@ -10,9 +10,6 @@ """ -from builtins import str -from builtins import range -from builtins import object import pytest import omero import omero.clients diff --git a/test/unit/test_parameters.py b/test/unit/test_parameters.py index 2844e2055..c46b67904 100644 --- a/test/unit/test_parameters.py +++ b/test/unit/test_parameters.py @@ -10,7 +10,6 @@ """ -from builtins import object from omero.rtypes import rlong, rint, rbool, rstring, rtime from omero_sys_ParametersI import ParametersI diff --git a/test/unit/test_path.py b/test/unit/test_path.py index e6cbbd4ad..ccfa1415c 100644 --- a/test/unit/test_path.py +++ b/test/unit/test_path.py @@ -8,7 +8,6 @@ Use is subject to license terms supplied in LICENSE.txt. """ -from builtins import object import omero_ext.path as path diff --git a/test/unit/test_permissions.py b/test/unit/test_permissions.py index 82472f40b..9abff5de4 100644 --- a/test/unit/test_permissions.py +++ b/test/unit/test_permissions.py @@ -9,8 +9,6 @@ Use is subject to license terms supplied in LICENSE.txt """ -from builtins import str -from builtins import object import omero.model diff --git a/test/unit/test_python_only.py b/test/unit/test_python_only.py index d539835fc..aec6f2a0a 100644 --- a/test/unit/test_python_only.py +++ b/test/unit/test_python_only.py @@ -9,7 +9,6 @@ """ -from builtins import object import pytest import omero import Ice diff --git a/test/unit/test_rois.py b/test/unit/test_rois.py index 48c5a486b..47c3b81f1 100644 --- a/test/unit/test_rois.py +++ b/test/unit/test_rois.py @@ -23,7 +23,6 @@ Simple tests of various ROI utilities """ -from builtins import object from omero.util.ROI_utils import pointsStringToXYlist, xyListToBbox from omero.util.roi_handling_utils import points_string_to_xy_list diff --git a/test/unit/test_rtypes.py b/test/unit/test_rtypes.py index df20b33df..1d8ffd832 100644 --- a/test/unit/test_rtypes.py +++ b/test/unit/test_rtypes.py @@ -8,8 +8,6 @@ * Use is subject to license terms supplied in LICENSE.txt */ """ -from builtins import str -from builtins import object import sys import pytest import omero diff --git a/test/unit/test_tempfiles.py b/test/unit/test_tempfiles.py index d831fe688..54f030dcf 100644 --- a/test/unit/test_tempfiles.py +++ b/test/unit/test_tempfiles.py @@ -9,8 +9,6 @@ */ """ -from builtins import str -from builtins import object import logging logging.basicConfig(level=0) diff --git a/test/unit/test_util.py b/test/unit/test_util.py index c39c707ca..9edb430b7 100644 --- a/test/unit/test_util.py +++ b/test/unit/test_util.py @@ -24,9 +24,6 @@ Test of various things under omero.util """ -from builtins import str -from builtins import range -from builtins import object import json import pytest from omero_ext.path import path