From 90e8bd6558ef8359464eedbac226c3a883271448 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 24 Jun 2019 14:40:07 +0100
Subject: [PATCH] Converted to use new convenience imports

---
 openflexure_microscope/plugins/default/autofocus/api.py     | 6 +-----
 openflexure_microscope/plugins/default/autofocus/plugin.py  | 2 +-
 .../plugins/default/camera_calibration/plugin.py            | 5 +----
 openflexure_microscope/plugins/default/scan/api.py          | 4 +---
 openflexure_microscope/plugins/default/scan/plugin.py       | 3 ++-
 .../plugins/testing/schema_example/api.py                   | 5 +----
 .../plugins/testing/schema_example/plugin.py                | 2 +-
 7 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/openflexure_microscope/plugins/default/autofocus/api.py b/openflexure_microscope/plugins/default/autofocus/api.py
index a737e7fb..5f598449 100644
--- a/openflexure_microscope/plugins/default/autofocus/api.py
+++ b/openflexure_microscope/plugins/default/autofocus/api.py
@@ -1,11 +1,7 @@
 import numpy as np
 import logging
 
-from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
-from openflexure_microscope.api.utilities import JsonPayload
-
-from flask import request, jsonify
-
+from openflexure_microscope.devel import MicroscopeViewPlugin, JsonPayload, request, jsonify
 
 class MeasureSharpnessAPI(MicroscopeViewPlugin):
     def post(self):
diff --git a/openflexure_microscope/plugins/default/autofocus/plugin.py b/openflexure_microscope/plugins/default/autofocus/plugin.py
index 302fe9a0..9dcd8b30 100644
--- a/openflexure_microscope/plugins/default/autofocus/plugin.py
+++ b/openflexure_microscope/plugins/default/autofocus/plugin.py
@@ -3,12 +3,12 @@ import logging
 import numpy as np
 from contextlib import contextmanager
 
-from openflexure_microscope.plugins import MicroscopePlugin
 from openflexure_microscope.utilities import set_properties
 
 from .focus_utils import sharpness_sum_lap2, JPEGSharpnessMonitor
 from .api import MeasureSharpnessAPI, AutofocusAPI, FastAutofocusAPI
 
+from openflexure_microscope.devel import MicroscopePlugin
 
 class AutofocusPlugin(MicroscopePlugin):
     """
diff --git a/openflexure_microscope/plugins/default/camera_calibration/plugin.py b/openflexure_microscope/plugins/default/camera_calibration/plugin.py
index 9096a91e..e57a4a47 100644
--- a/openflexure_microscope/plugins/default/camera_calibration/plugin.py
+++ b/openflexure_microscope/plugins/default/camera_calibration/plugin.py
@@ -1,8 +1,5 @@
-from openflexure_microscope.plugins import MicroscopePlugin
-from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
-from openflexure_microscope.api.utilities import JsonPayload
+from openflexure_microscope.devel import MicroscopePlugin, MicroscopeViewPlugin, JsonPayload, request, jsonify
 
-from flask import request, jsonify
 import logging
 
 from .recalibrate_utils import recalibrate_camera, auto_expose_and_freeze_settings
diff --git a/openflexure_microscope/plugins/default/scan/api.py b/openflexure_microscope/plugins/default/scan/api.py
index 09779f4b..9e8981e5 100644
--- a/openflexure_microscope/plugins/default/scan/api.py
+++ b/openflexure_microscope/plugins/default/scan/api.py
@@ -1,7 +1,5 @@
-from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
-from openflexure_microscope.api.utilities import JsonPayload
+from openflexure_microscope.devel import MicroscopeViewPlugin, JsonPayload, request, jsonify, abort
 
-from flask import request, jsonify, abort
 import logging
 
 class TileScanAPI(MicroscopeViewPlugin):
diff --git a/openflexure_microscope/plugins/default/scan/plugin.py b/openflexure_microscope/plugins/default/scan/plugin.py
index dbf37b0c..d7f5bceb 100644
--- a/openflexure_microscope/plugins/default/scan/plugin.py
+++ b/openflexure_microscope/plugins/default/scan/plugin.py
@@ -6,7 +6,8 @@ import itertools
 import logging
 
 from openflexure_microscope.camera.base import generate_basename
-from openflexure_microscope.plugins import MicroscopePlugin
+
+from openflexure_microscope.devel import MicroscopePlugin
 
 from .api import TileScanAPI
 
diff --git a/openflexure_microscope/plugins/testing/schema_example/api.py b/openflexure_microscope/plugins/testing/schema_example/api.py
index 67f92b62..04cefe66 100644
--- a/openflexure_microscope/plugins/testing/schema_example/api.py
+++ b/openflexure_microscope/plugins/testing/schema_example/api.py
@@ -1,8 +1,5 @@
-from openflexure_microscope.api.utilities import JsonPayload
-from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
-from openflexure_microscope.exceptions import TaskDeniedException
+from openflexure_microscope.devel import MicroscopeViewPlugin, TaskDeniedException, JsonPayload, Response, request, escape, jsonify
 
-from flask import request, Response, escape, jsonify
 import logging
 
 class DoAPI(MicroscopeViewPlugin):
diff --git a/openflexure_microscope/plugins/testing/schema_example/plugin.py b/openflexure_microscope/plugins/testing/schema_example/plugin.py
index da2264c9..0e57fe26 100644
--- a/openflexure_microscope/plugins/testing/schema_example/plugin.py
+++ b/openflexure_microscope/plugins/testing/schema_example/plugin.py
@@ -2,7 +2,7 @@ import random
 import time
 import os
 import json
-from openflexure_microscope.plugins import MicroscopePlugin
+from openflexure_microscope.devel import MicroscopePlugin
 
 from .api import DoAPI, TaskAPI