Remove all unnecessary builtins imports

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

manualtests/populate_roi_test.py

@@ -23,8 +23,6 @@
 #
 
 
-from builtins import range
-from builtins import object
 import unittest
 import os
 

src/omero/callbacks.py

@@ -14,7 +14,6 @@
   module for backwards compatibility.
 """
 
-from builtins import str
 import Ice
 import logging
 import threading

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")
 

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:

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

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

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

src/omero/gateway/__init__.py

@@ -12,11 +12,6 @@
 # [email protected].
 
 # 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

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('.')
 

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

src/omero/gateway/utils.py

@@ -23,8 +23,6 @@
 # Version: 1.0
 #
 
-from builtins import str
-from builtins import object
 import logging
 import json
 

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

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"""

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

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

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

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

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

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

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

src/omero/plugins/export.py

@@ -9,7 +9,6 @@
    Startup plugin for command-line exporter
 """
 
-from builtins import str
 import os
 import sys
 

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
 

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

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

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

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

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

src/omero/plugins/obj.py

@@ -27,8 +27,6 @@
 """
 
 
-from builtins import str
-from builtins import object
 import re
 import sys
 import shlex

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

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

src/omero/plugins/search.py

@@ -11,7 +11,6 @@
 """
 
 
-from builtins import str
 import sys
 import time
 

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

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
 

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()

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

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

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

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

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

src/omero/util/OmeroPopo.py

@@ -19,8 +19,6 @@
 # @author Donald MacDonald     
 # <a href="mailto:[email protected]">[email protected]</a>
 
-from builtins import range
-from builtins import object
 import math
 import numpy
 

src/omero/util/ROIDrawingUtils.py

@@ -72,7 +72,6 @@
 """
 
 
-from builtins import object
 try:
     from PIL import Image, ImageDraw  # see ticket:2597
 except ImportError: