diff --git a/openflexure_microscope/api/app.py b/openflexure_microscope/api/app.py index 2ca440bb..ebb77d19 100644 --- a/openflexure_microscope/api/app.py +++ b/openflexure_microscope/api/app.py @@ -24,8 +24,8 @@ import pkg_resources from flask import abort, send_file from flask_cors import CORS, cross_origin from labthings import create_app -from labthings.views import View from labthings.extensions import find_extensions +from labthings.views import View from openflexure_microscope.api.microscope import default_microscope as api_microscope from openflexure_microscope.api.utilities import init_default_extensions, list_routes diff --git a/openflexure_microscope/api/v2/views/instrument.py b/openflexure_microscope/api/v2/views/instrument.py index 95c237cd..c441240e 100644 --- a/openflexure_microscope/api/v2/views/instrument.py +++ b/openflexure_microscope/api/v2/views/instrument.py @@ -1,7 +1,7 @@ import logging from flask import abort -from labthings import find_component, fields +from labthings import fields, find_component from labthings.marshalling import use_args from labthings.utilities import create_from_path, get_by_path, set_by_path from labthings.views import PropertyView, View diff --git a/openflexure_microscope/camera/base.py b/openflexure_microscope/camera/base.py index de1530a3..4ef6d7b8 100644 --- a/openflexure_microscope/camera/base.py +++ b/openflexure_microscope/camera/base.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- +import io import logging import threading import time -import io from abc import ABCMeta, abstractmethod from collections import namedtuple diff --git a/openflexure_microscope/captures/__init__.py b/openflexure_microscope/captures/__init__.py index 4df0ac64..7d15ca40 100644 --- a/openflexure_microscope/captures/__init__.py +++ b/openflexure_microscope/captures/__init__.py @@ -1,3 +1,3 @@ from . import capture, capture_manager -from .capture import CaptureObject, THUMBNAIL_SIZE +from .capture import THUMBNAIL_SIZE, CaptureObject from .capture_manager import CaptureManager diff --git a/openflexure_microscope/captures/capture.py b/openflexure_microscope/captures/capture.py index be5dd401..8f75bf6d 100644 --- a/openflexure_microscope/captures/capture.py +++ b/openflexure_microscope/captures/capture.py @@ -6,9 +6,9 @@ import logging import os import uuid from collections import OrderedDict -from PIL import Image import dateutil.parser +from PIL import Image from openflexure_microscope.captures import piexif from openflexure_microscope.captures.piexif import InvalidImageDataError diff --git a/openflexure_microscope/microscope.py b/openflexure_microscope/microscope.py index 17d2be9f..b9b398e1 100644 --- a/openflexure_microscope/microscope.py +++ b/openflexure_microscope/microscope.py @@ -10,7 +10,7 @@ import pkg_resources from expiringdict import ExpiringDict from openflexure_microscope.camera.mock import MissingCamera -from openflexure_microscope.captures import CaptureManager, THUMBNAIL_SIZE +from openflexure_microscope.captures import THUMBNAIL_SIZE, CaptureManager from openflexure_microscope.stage.mock import MissingStage from openflexure_microscope.stage.sanga import SangaDeltaStage, SangaStage diff --git a/openflexure_microscope/rescue/auto.py b/openflexure_microscope/rescue/auto.py index 5bb95f22..bc4c52bc 100644 --- a/openflexure_microscope/rescue/auto.py +++ b/openflexure_microscope/rescue/auto.py @@ -1,10 +1,9 @@ import logging import os -import sys import platform -import pkg_resources +import sys -from .error_sources import bcolors +import pkg_resources from openflexure_microscope.paths import ( FALLBACK_OPENFLEXURE_VAR_PATH, @@ -13,11 +12,12 @@ from openflexure_microscope.paths import ( from . import ( check_capture_reload, - check_settings, check_picamera, check_sangaboard, + check_settings, check_system, ) +from .error_sources import bcolors # Paths for suggestions LOGS_PATHS = [ diff --git a/openflexure_microscope/rescue/check_capture_reload.py b/openflexure_microscope/rescue/check_capture_reload.py index 54459665..e50ae05b 100644 --- a/openflexure_microscope/rescue/check_capture_reload.py +++ b/openflexure_microscope/rescue/check_capture_reload.py @@ -1,9 +1,9 @@ import logging from openflexure_microscope.captures.capture import ( + EXIF_FORMATS, build_captures_from_exif, make_file_list, - EXIF_FORMATS, ) from openflexure_microscope.captures.capture_manager import BASE_CAPTURE_PATH from openflexure_microscope.config import user_settings diff --git a/openflexure_microscope/rescue/check_sangaboard.py b/openflexure_microscope/rescue/check_sangaboard.py index 8c7f6aa7..13b154b1 100644 --- a/openflexure_microscope/rescue/check_sangaboard.py +++ b/openflexure_microscope/rescue/check_sangaboard.py @@ -1,7 +1,7 @@ -from .error_sources import ErrorSource - from openflexure_microscope.config import user_configuration +from .error_sources import ErrorSource + def main(): error_sources = [] diff --git a/openflexure_microscope/rescue/check_settings.py b/openflexure_microscope/rescue/check_settings.py index 62c30be8..64fffb92 100644 --- a/openflexure_microscope/rescue/check_settings.py +++ b/openflexure_microscope/rescue/check_settings.py @@ -1,5 +1,6 @@ import json import logging + from .error_sources import ErrorSource ERROR_SOURCES = [] diff --git a/openflexure_microscope/rescue/check_system.py b/openflexure_microscope/rescue/check_system.py index 1c3f31ee..880ba87c 100644 --- a/openflexure_microscope/rescue/check_system.py +++ b/openflexure_microscope/rescue/check_system.py @@ -1,5 +1,6 @@ -from urllib.request import urlopen from urllib.error import URLError +from urllib.request import urlopen + import psutil from .error_sources import WarningSource