Ran Isort

examples/nested_thing.py

@@ -1,14 +1,13 @@
-import random
+import logging
 import math
+import random
 import uuid
-import logging
 
-from labthings.server.quick import create_app
-from labthings.server.view import PropertyView
+from labthings.server import fields
 from labthings.server.find import find_component
+from labthings.server.quick import create_app
 from labthings.server.schema import Schema
-from labthings.server import fields
-
+from labthings.server.view import PropertyView
 
 """
 Class for our lab component functionality. This could include serial communication,

examples/simple_extensions.py

@@ -2,20 +2,17 @@
 
 patch_all()
 
-import random
+import logging
 import math
+import random
 import time
-import logging
 
-from labthings.server.quick import create_app
-from labthings.server.view import ActionView, PropertyView
-from labthings.server.find import find_component
-from labthings.server import fields
 from labthings.core.utilities import path_relative_to
-
+from labthings.server import fields
 from labthings.server.extensions import BaseExtension
-
-import logging
+from labthings.server.find import find_component
+from labthings.server.quick import create_app
+from labthings.server.view import ActionView, PropertyView
 
 logging.basicConfig(level=logging.DEBUG)
 

examples/simple_thing.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 import time
 
-from labthings import create_app, semantics, find_component, fields
-from labthings.views import ActionView, PropertyView, op
+from labthings import create_app, fields, find_component, semantics
 from labthings.example_components import PretendSpectrometer
 from labthings.json import encode_json
-
+from labthings.views import ActionView, PropertyView, op
 
 """
 Class for our lab component functionality. This could include serial communication,

src/labthings/__init__.py

@@ -1,40 +1,21 @@
 # Main LabThing class
+# Submodules
+from . import extensions, fields, json, marshalling, semantics, views
+# Action threads
+from .actions import (ActionKilledException, current_action,
+                      update_action_data, update_action_progress)
+# Functions to speed up finding global objects
+from .find import (current_labthing, find_component, find_extension,
+                   registered_components, registered_extensions)
 from .labthing import LabThing
-
 # Quick-create app+LabThing function
 from .quick import create_app
-
-# Suggested WSGI+WebSocket server class
-from .wsgi import Server
-
-# Functions to speed up finding global objects
-from .find import current_labthing
-from .find import registered_extensions
-from .find import registered_components
-from .find import find_extension
-from .find import find_component
-
-# Synchronisation classes
-from .sync import StrictLock
-from .sync import CompositeLock
-from .sync import ClientEvent
-
-# Action threads
-from .actions import current_action
-from .actions import update_action_progress
-from .actions import update_action_data
-from .actions import ActionKilledException
-
 # Schema and field
 from .schema import Schema
-from . import fields
-
-# Submodules
-from . import extensions
-from . import views
-from . import marshalling
-from . import semantics
-from . import json
+# Synchronisation classes
+from .sync import ClientEvent, CompositeLock, StrictLock
+# Suggested WSGI+WebSocket server class
+from .wsgi import Server
 
 __all__ = [
     "LabThing",

src/labthings/actions/__init__.py

@@ -5,13 +5,9 @@
     "ActionKilledException",
 ]
 
-from .pool import (
-    Pool,
-    current_action,
-    update_action_progress,
-    update_action_data,
-)
-from .thread import ActionThread, ActionKilledException
+from .pool import (Pool, current_action, update_action_data,
+                   update_action_progress)
+from .thread import ActionKilledException, ActionThread
 
 __all__ = [
     "Pool",

src/labthings/actions/pool.py

@@ -1,7 +1,7 @@
 import logging
+import threading
 from functools import wraps
 
-import threading
 from .thread import ActionThread
 
 

src/labthings/actions/thread.py

@@ -1,10 +1,11 @@
 import ctypes
-from flask import copy_current_request_context, has_request_context
 import datetime
 import logging
+import threading
 import traceback
 import uuid
-import threading
+
+from flask import copy_current_request_context, has_request_context
 
 from ..utilities import TimeoutTracker
 

src/labthings/apispec/__init__.py

@@ -1,3 +1,3 @@
-from .plugins import MarshmallowPlugin, FlaskLabThingsPlugin
+from .plugins import FlaskLabThingsPlugin, MarshmallowPlugin
 
 __all__ = ["MarshmallowPlugin", "FlaskLabThingsPlugin"]

src/labthings/apispec/plugins.py

@@ -1,16 +1,15 @@
-from apispec.ext.marshmallow import MarshmallowPlugin as _MarshmallowPlugin
-from apispec.ext.marshmallow import OpenAPIConverter
 import re
 
-from flask.views import http_method_funcs
-
 from apispec import BasePlugin
+from apispec.ext.marshmallow import MarshmallowPlugin as _MarshmallowPlugin
+from apispec.ext.marshmallow import OpenAPIConverter
+from flask.views import http_method_funcs
 
-from ..utilities import merge, get_docstring, get_summary
-from ..views import PropertyView, ActionView
+from .. import fields
 from ..json.schemas import schema_to_json
 from ..schema import build_action_schema
-from .. import fields
+from ..utilities import get_docstring, get_summary, merge
+from ..views import ActionView, PropertyView
 
 
 class ExtendedOpenAPIConverter(OpenAPIConverter):

src/labthings/default_views/actions.py

@@ -1,10 +1,10 @@
 from flask import abort
 
-from ..views import View
+from .. import fields
+from ..find import current_labthing
 from ..marshalling import use_args
 from ..schema import ActionSchema
-from ..find import current_labthing
-from .. import fields
+from ..views import View
 
 
 class ActionQueueView(View):

src/labthings/default_views/docs/__init__.py

@@ -1,7 +1,7 @@
-from flask import render_template, Blueprint, make_response
+from flask import Blueprint, make_response, render_template
 
-from ...views import View
 from ...find import current_labthing
+from ...views import View
 
 
 class APISpecView(View):

src/labthings/default_views/extensions.py

@@ -1,7 +1,7 @@
 """Top-level representation of attached and enabled Extensions"""
-from ..views import View
 from ..find import registered_extensions
 from ..schema import ExtensionSchema
+from ..views import View
 
 
 class ExtensionList(View):

src/labthings/default_views/sockets.py

@@ -1,8 +1,7 @@
-from ..sockets import SocketSubscriber
-from ..find import current_labthing
-
 import logging
 
+from ..find import current_labthing
+from ..sockets import SocketSubscriber
 
 STATIC_SOCKET_RESPONSES = {"__unittest": "__unittest_response"}
 

src/labthings/example_components/spectrometer.py

@@ -1,5 +1,5 @@
-import random
 import math
+import random
 import time
 
 

src/labthings/extensions.py

@@ -1,14 +1,14 @@
+import glob
 import logging
+import os
+import sys
 import traceback
-from flask import url_for
-
 from importlib import util
-import sys
-import os
-import glob
 
+from flask import url_for
+
+from .utilities import camel_to_snake, get_docstring, snake_to_spine
 from .views.static import static_from
-from .utilities import get_docstring, camel_to_snake, snake_to_spine
 
 
 class BaseExtension:

src/labthings/fields.py

@@ -1,40 +1,12 @@
 # Marshmallow fields
-from marshmallow import ValidationError
-
 from base64 import b64decode
 
+from marshmallow import ValidationError
 from marshmallow.fields import (
-    Field,
-    Raw,
-    Nested,
-    Mapping,
-    Dict,
-    List,
-    Tuple,
-    String,
-    UUID,
-    Number,
-    Integer,
-    Decimal,
-    Boolean,
-    Float,
-    DateTime,
-    NaiveDateTime,
-    AwareDateTime,
-    Time,
-    Date,
-    TimeDelta,
-    Url,
-    URL,
-    Email,
-    Method,
-    Function,
-    Str,
-    Bool,
-    Int,
-    Constant,
-    Pluck,
-)
+    URL, UUID, AwareDateTime, Bool, Boolean, Constant, Date, DateTime, Decimal,
+    Dict, Email, Field, Float, Function, Int, Integer, List, Mapping, Method,
+    NaiveDateTime, Nested, Number, Pluck, Raw, Str, String, Time, TimeDelta,
+    Tuple, Url)
 
 __all__ = [
     "Bytes",

src/labthings/find.py

@@ -1,7 +1,8 @@
 import logging
-from flask import current_app, url_for
 import weakref
 
+from flask import current_app, url_for
+
 from .names import EXTENSION_NAME
 
 __all__ = [

src/labthings/httperrorhandler.py

@@ -1,9 +1,8 @@
-from flask import escape
-from werkzeug.exceptions import default_exceptions
-from werkzeug.exceptions import HTTPException
-
 import logging
 
+from flask import escape
+from werkzeug.exceptions import HTTPException, default_exceptions
+
 
 class SerializedExceptionHandler:
 

src/labthings/json/encoder.py

@@ -1,8 +1,9 @@
 # Flask JSON encoder so we get UUID, datetime etc support
-from flask.json import JSONEncoder
+import json
 from base64 import b64encode
 from collections import UserString
-import json
+
+from flask.json import JSONEncoder
 
 
 class LabThingsJSONEncoder(JSONEncoder):

src/labthings/json/marshmallow_jsonschema/base.py

@@ -3,11 +3,12 @@
 import uuid
 from inspect import isclass
 
-from marshmallow import fields, missing, Schema, validate
+from marshmallow import Schema, fields, missing, validate
 from marshmallow.class_registry import get_class
 
 from .exceptions import UnsupportedValueError
-from .validation import handle_length, handle_one_of, handle_range, handle_regexp
+from .validation import (handle_length, handle_one_of, handle_range,
+                         handle_regexp)
 
 __all__ = ("JSONSchema",)
 

src/labthings/json/schemas.py

@@ -1,9 +1,10 @@
-import werkzeug.routing
 import re
-from marshmallow import Schema, fields
 from collections.abc import Mapping
-from .marshmallow_jsonschema import JSONSchema
 
+import werkzeug.routing
+from marshmallow import Schema, fields
+
+from .marshmallow_jsonschema import JSONSchema
 
 PATH_RE = re.compile(r"<(?:[^:<>]+:)?([^<>]+)>")
 # Conversion map of werkzeug rule converters to Javascript schema types