From 0d895326b301ff9def794401b79f0c39ffb2e272 Mon Sep 17 00:00:00 2001
From: William Moore <w.moore@dundee.ac.uk>
Date: Thu, 14 Nov 2019 23:01:11 +0000
Subject: [PATCH] flake8 fixes

---
 omero_parade/annotation_filters/omero_filters.py | 2 +-
 omero_parade/data_providers.py                   | 2 +-
 omero_parade/omero_filters.py                    | 2 +-
 omero_parade/views.py                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/omero_parade/annotation_filters/omero_filters.py b/omero_parade/annotation_filters/omero_filters.py
index e2660407..eb95c778 100644
--- a/omero_parade/annotation_filters/omero_filters.py
+++ b/omero_parade/annotation_filters/omero_filters.py
@@ -44,7 +44,7 @@ def get_script(request, script_name, conn):
         js_object_attr = "wellId"
         obj_ids = get_well_ids(conn, plate_id)
     else:
-        obj_ids = [long(i) for i in image_ids]
+        obj_ids = [int(i) for i in image_ids]
     query_service = conn.getQueryService()
     params = ParametersI()
     # Include "-1" so that if we have no object IDs that the query does
diff --git a/omero_parade/data_providers.py b/omero_parade/data_providers.py
index 03e7d50c..899d5f35 100644
--- a/omero_parade/data_providers.py
+++ b/omero_parade/data_providers.py
@@ -104,5 +104,5 @@ def get_image_map_annotations(conn, plate_id, field_id, ns, key=None):
     for l in links:
         for kv in l.child.getMapValue():
             if key == kv.name:
-                map_values[l.parent.id.val] = long(kv.value)
+                map_values[l.parent.id.val] = int(kv.value)
     return map_values
diff --git a/omero_parade/omero_filters.py b/omero_parade/omero_filters.py
index 7980c240..877e4767 100644
--- a/omero_parade/omero_filters.py
+++ b/omero_parade/omero_filters.py
@@ -40,7 +40,7 @@ def get_script(request, script_name, conn):
         objects = conn.getObjects('Image', opts={'dataset': dataset_id})
         img_ids = [i.id for i in objects]
     else:
-        img_ids = [long(i) for i in image_ids]
+        img_ids = [int(i) for i in image_ids]
     query_service = conn.getQueryService()
 
     if script_name == "ROI_count":
diff --git a/omero_parade/views.py b/omero_parade/views.py
index f1f96f2b..9357e74d 100644
--- a/omero_parade/views.py
+++ b/omero_parade/views.py
@@ -68,7 +68,7 @@ def get_long_or_default(request, name, default):
     val = None
     val_raw = request.GET.get(name, default)
     if val_raw is not None:
-        val = long(val_raw)
+        val = int(val_raw)
     return val