Remove usage of future.standard_library.install_aliases

src/omero/gateway/__init__.py

@@ -12,8 +12,6 @@
 # [email protected].
 
 # Set up the python include paths
-from future import standard_library
-standard_library.install_aliases()
 from builtins import chr
 from builtins import map
 from builtins import str

src/omero/gateway/scripts/dbhelpers.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 from builtins import object
 import sys

src/omero/gateway/scripts/testdb_create.py

@@ -9,8 +9,6 @@
 Library for gateway tests
 """
 
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 from builtins import range
 from builtins import object

src/omero/util/imageUtil.py

@@ -29,8 +29,6 @@
 used for making figures.
 """
 
-from future import standard_library
-standard_library.install_aliases()
 try:
     from PIL import Image, ImageDraw, ImageFont  # see ticket:2597
 except ImportError:

src/omero/util/image_utils.py

@@ -22,8 +22,6 @@
 Utility methods for dealing with scripts.
 """
 
-from future import standard_library
-standard_library.install_aliases()
 try:
     from PIL import Image, ImageDraw, ImageFont  # see ticket:2597
 except ImportError:

src/omero/util/populate_roi.py

@@ -23,8 +23,6 @@
 #
 
 
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 from builtins import range
 from builtins import object

src/omero/util/sessions.py

@@ -23,20 +23,14 @@
 Library for managing user sessions.
 """
 
-from future import standard_library
-standard_library.install_aliases()
 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
 from omero_ext.path import path
 
-try:
-    from urllib.parse import quote, unquote
-except ImportError:
-    # Python2
-    from urllib.parse import quote, unquote
+from urllib.parse import quote, unquote
 
 import logging
 

src/omero/util/text.py

@@ -11,8 +11,6 @@
 # The following classes (ALIGN, Column, Table) were originally from
 # http://code.activestate.com/recipes/577202-render-tables-for-text-interface/
 #
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 from builtins import zip
 from builtins import range

src/omero/util/upgrade_check.py

@@ -5,15 +5,13 @@
 # Copyright 2009 Glencoe Software, Inc. All rights reserved.
 # Use is subject to license terms supplied in LICENSE.txt
 
-from future import standard_library
 from builtins import str
 from builtins import object
 from omero_version import omero_version
 
 import platform
 import logging
 import requests
-standard_library.install_aliases()
 
 # Ensure we are using pyopenssl (ome/omero-py#240)
 try:

src/omero_ext/which.py

@@ -34,8 +34,6 @@
     from HKLM\SOFTWARE\...\perl.exe
 """
 
-from future import standard_library
-standard_library.install_aliases()
 from builtins import map
 from builtins import range
 _cmdlnUsage = """

test/unit/clitest/test_db.py

@@ -9,8 +9,6 @@
 
 """
 
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 from builtins import object
 import pytest

test/unit/clitest/test_import.py

@@ -9,8 +9,6 @@
 
 """
 
-from future import standard_library
-standard_library.install_aliases()
 from builtins import str
 from builtins import range
 from builtins import object