chore: remove future import (#66)

Author: bathienle

cytomine/cytomine.py

@@ -14,31 +14,26 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 try:
     from json.decoder import JSONDecodeError
 except ImportError:
     # Python 2
     JSONDecodeError = ValueError
 
-import logging
 import base64
+import functools
 import hashlib
 import hmac
-import sys
+import logging
 import os
-import requests
 import shutil
-import warnings
-import functools
+import sys
 import time
-from time import strftime, gmtime
-from future.builtins import bytes
+import warnings
 from argparse import ArgumentParser
+from time import gmtime, strftime
+
+import requests
 from cachecontrol import CacheControlAdapter
 from requests_toolbelt import MultipartEncoder
 from requests_toolbelt.utils import dump
@@ -729,8 +724,12 @@ def upload_image(self, filename, id_storage, id_project=None,
             return False
 
     def _process_upload_response(self, response_data):
+        from .models.image import (
+            AbstractImage,
+            ImageInstance,
+            ImageInstanceCollection,
+        )
         from .models.storage import UploadedFile
-        from .models.image import AbstractImage, ImageInstance, ImageInstanceCollection
 
         self._logger.debug("Entering _process_upload_response(response_data=%s)", response_data)
 

cytomine/models/__init__.py

@@ -51,10 +51,7 @@
     Term,
     TermCollection,
 )
-from .project import (
-    Project,
-    ProjectCollection,
-)
+from .project import Project, ProjectCollection
 from .property import (
     AttachedFile,
     AttachedFileCollection,

cytomine/models/_utilities/__init__.py

@@ -14,6 +14,6 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from .parallel import generic_download, makedirs, is_false
-from .dump import generic_image_dump, DumpError
-from .pattern_matching import resolve_pattern, is_iterable
+from .dump import DumpError, generic_image_dump
+from .parallel import generic_download, is_false, makedirs
+from .pattern_matching import is_iterable, resolve_pattern

cytomine/models/_utilities/parallel.py

@@ -22,8 +22,8 @@
 except ImportError:
     import Queue as queue
 
-from threading import Thread
 from multiprocessing import cpu_count
+from threading import Thread
 
 
 def is_false(v):

cytomine/models/annotation.py

@@ -14,19 +14,13 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
 import os
-import re
 
 from cytomine.cytomine import Cytomine
-from cytomine.models.collection import Collection, CollectionPartialUploadException
+from cytomine.models.collection import Collection
 from cytomine.models.model import Model
-from ._utilities import generic_image_dump, generic_download, is_false
+
+from ._utilities import generic_download, generic_image_dump, is_false
 
 
 class Annotation(Model):

cytomine/models/collection.py

@@ -14,25 +14,22 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
 # Importing collections.abc objects from collections is deprecated
 # since python 3.3. 
 from sys import version_info
+
 if version_info.major < 3 or \
         (version_info.major == 3 and version_info.minor < 3):
     from collections import MutableSequence
 else:
     from collections.abc import MutableSequence
 
-import six
 import copy
 
+import six
+
 from cytomine.cytomine import Cytomine
+
 from ._utilities.parallel import generic_chunk_parallel
 
 

cytomine/models/image.py

@@ -14,18 +14,13 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
-import re
 import os
+import re
 
 from cytomine.cytomine import Cytomine, deprecated
 from cytomine.models.collection import Collection
 from cytomine.models.model import Model
+
 from ._utilities import generic_image_dump
 
 

cytomine/models/imagegroup.py

@@ -14,14 +14,6 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import re
-import os
-
 __author__ = "Rubens Ulysse <urubens@uliege.be>"
 __contributors__ = ["Marée Raphaël <raphael.maree@uliege.be>", "Mormont Romain <r.mormont@uliege.be>"]
 __copyright__ = "Copyright 2010-2022 University of Liège, Belgium, http://www.cytomine.be/"

cytomine/models/model.py

@@ -14,14 +14,9 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
+import json
 
 import six
-import json
 
 from cytomine.cytomine import Cytomine
 

cytomine/models/ontology.py

@@ -14,14 +14,7 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from cytomine.cytomine import Cytomine
-
-
 from cytomine.models.collection import Collection
 from cytomine.models.model import Model
 

cytomine/models/project.py

@@ -14,14 +14,7 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from cytomine import Cytomine
-
-
 from cytomine.models.collection import Collection
 from cytomine.models.model import Model
 

cytomine/models/property.py

@@ -14,18 +14,12 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import re
 
-
 from cytomine.cytomine import Cytomine
 from cytomine.models.annotation import Annotation
 from cytomine.models.collection import Collection, DomainCollection
-from cytomine.models.model import Model, DomainModel
+from cytomine.models.model import DomainModel, Model
 
 
 class Property(DomainModel):

cytomine/models/social.py

@@ -14,12 +14,6 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
 from cytomine.models.collection import Collection
 from cytomine.models.model import Model
 

cytomine/models/storage.py

@@ -14,11 +14,6 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 
 from cytomine.models.collection import Collection
 from cytomine.models.model import Model

cytomine/models/track.py

@@ -14,12 +14,6 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
 from cytomine.cytomine import Cytomine
 from cytomine.models.collection import Collection
 from cytomine.models.model import Model

cytomine/models/user.py

@@ -14,11 +14,6 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 
 from cytomine.cytomine import Cytomine
 from cytomine.models.collection import Collection

cytomine/utilities/annotations.py

@@ -1,6 +1,5 @@
 from cytomine.models import AnnotationCollection
 
-
 REVIEWED_INCLUDE = 1
 REVIEWED_ONLY = 2
 REVIEWED_EXCLUDE = 0

examples/add_annotation.py

@@ -14,10 +14,6 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import logging
 import sys
@@ -26,9 +22,12 @@
 from shapely.geometry import Point, box
 
 from cytomine import Cytomine
-from cytomine.models import Property, Annotation, AnnotationTerm, AnnotationCollection
-
-
+from cytomine.models import (
+    Annotation,
+    AnnotationCollection,
+    AnnotationTerm,
+    Property,
+)
 
 logging.basicConfig()
 logger = logging.getLogger("cytomine.client")

examples/add_annotation_links.py

@@ -14,10 +14,6 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import logging
 import sys
@@ -26,8 +22,13 @@
 from shapely.geometry import Point, box
 
 from cytomine import Cytomine
-from cytomine.models import Annotation, AnnotationCollection, \
-    ImageGroupImageInstanceCollection, AnnotationGroup, AnnotationLink
+from cytomine.models import (
+    Annotation,
+    AnnotationCollection,
+    AnnotationGroup,
+    AnnotationLink,
+    ImageGroupImageInstanceCollection,
+)
 
 logging.basicConfig()
 logger = logging.getLogger("cytomine.client")

examples/add_imagegroup.py

@@ -14,16 +14,10 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import logging
 import sys
 from argparse import ArgumentParser
 
-
 from cytomine import Cytomine
 from cytomine.models import ImageGroup, ImageGroupImageInstance
 from cytomine.models.image import ImageInstanceCollection

examples/add_ontology.py

@@ -14,19 +14,17 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import logging
 import sys
 from argparse import ArgumentParser
 
 from cytomine import Cytomine
-from cytomine.models.ontology import Ontology, Term, RelationTerm, TermCollection
-
-
+from cytomine.models.ontology import (
+    Ontology,
+    RelationTerm,
+    Term,
+    TermCollection,
+)
 
 logging.basicConfig()
 logger = logging.getLogger("cytomine.client")