From fd2144ba94b86a4cf648ab962b10f51421ab31d5 Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2020 09:43:00 +0000
Subject: [PATCH 1/3] Remove unused imports

---
 src/labthings/json/encoder.py                     |  1 -
 src/labthings/json/marshmallow_jsonschema/base.py |  2 --
 src/labthings/server/schema.py                    | 11 +----------
 src/labthings/sync/event.py                       |  2 --
 src/labthings/wsgi.py                             |  2 +-
 tests/test_td.py                                  |  1 -
 6 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/labthings/json/encoder.py b/src/labthings/json/encoder.py
index d04ce8fa..161d76e8 100644
--- a/src/labthings/json/encoder.py
+++ b/src/labthings/json/encoder.py
@@ -1,4 +1,3 @@
-from flask import make_response, current_app
 
 # Flask JSON encoder so we get UUID, datetime etc support
 from flask.json import JSONEncoder
diff --git a/src/labthings/json/marshmallow_jsonschema/base.py b/src/labthings/json/marshmallow_jsonschema/base.py
index 56538a18..7749b216 100644
--- a/src/labthings/json/marshmallow_jsonschema/base.py
+++ b/src/labthings/json/marshmallow_jsonschema/base.py
@@ -5,8 +5,6 @@
 
 from marshmallow import fields, missing, Schema, validate
 from marshmallow.class_registry import get_class
-from marshmallow.decorators import post_dump
-from marshmallow import RAISE, INCLUDE, EXCLUDE
 
 from .exceptions import UnsupportedValueError
 from .validation import handle_length, handle_one_of, handle_range, handle_regexp
diff --git a/src/labthings/server/schema.py b/src/labthings/server/schema.py
index 2f5ee817..8b137891 100644
--- a/src/labthings/server/schema.py
+++ b/src/labthings/server/schema.py
@@ -1,10 +1 @@
-from ..schema import (
-    Schema,
-    FieldSchema,
-    TaskSchema,
-    ExtensionSchema,
-    ActionSchema,
-    build_action_schema,
-    pre_load,
-    pre_dump,
-)
+
diff --git a/src/labthings/sync/event.py b/src/labthings/sync/event.py
index 65a2536f..c500a80b 100644
--- a/src/labthings/sync/event.py
+++ b/src/labthings/sync/event.py
@@ -2,8 +2,6 @@
 import gevent
 import time
 import logging
-
-from gevent.monkey import get_original
 from gevent.lock import BoundedSemaphore
 
 from gevent.event import Event
diff --git a/src/labthings/wsgi.py b/src/labthings/wsgi.py
index fd9bffd8..62f1c69b 100644
--- a/src/labthings/wsgi.py
+++ b/src/labthings/wsgi.py
@@ -7,7 +7,7 @@
 from zeroconf import IPVersion, ServiceInfo, Zeroconf, get_all_addresses
 
 from geventwebsocket.handler import WebSocketHandler as _WebSocketHandler
-from logging import getLogger, StreamHandler, getLoggerClass, Formatter, DEBUG
+from logging import getLogger
 
 from .find import current_labthing
 
diff --git a/tests/test_td.py b/tests/test_td.py
index 5853b17e..dbddc185 100644
--- a/tests/test_td.py
+++ b/tests/test_td.py
@@ -1,7 +1,6 @@
 import pytest
 
 from labthings import fields
-from labthings import td
 
 from labthings.view import View
 

From 0582e772bf25ea971773758a7e7e401f957b6921 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Tue, 7 Jul 2020 10:47:18 +0100
Subject: [PATCH 2/3] Re-added compatibility import

---
 src/labthings/server/schema.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/labthings/server/schema.py b/src/labthings/server/schema.py
index 8b137891..3350660a 100644
--- a/src/labthings/server/schema.py
+++ b/src/labthings/server/schema.py
@@ -1 +1,21 @@
+from ..schema import (
+    Schema,
+    FieldSchema,
+    TaskSchema,
+    ExtensionSchema,
+    ActionSchema,
+    build_action_schema,
+    pre_load,
+    pre_dump,
+)
 
+__all__ = [
+    "Schema",
+    "FieldSchema",
+    "TaskSchema",
+    "ExtensionSchema",
+    "ActionSchema",
+    "build_action_schema",
+    "pre_load",
+    "pre_dump",
+]

From 93994335b669991bbc726a349877abbfd8d88fc4 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Tue, 7 Jul 2020 10:51:01 +0100
Subject: [PATCH 3/3] Code formatting

---
 src/labthings/json/encoder.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/labthings/json/encoder.py b/src/labthings/json/encoder.py
index 161d76e8..4d0b9d88 100644
--- a/src/labthings/json/encoder.py
+++ b/src/labthings/json/encoder.py
@@ -1,4 +1,3 @@
-
 # Flask JSON encoder so we get UUID, datetime etc support
 from flask.json import JSONEncoder
 from base64 import b64encode