Fixed internal imports

Author: jtc42

src/labthings/default_views/tasks.py

@@ -3,7 +3,7 @@
 from ..view import View
 from ..schema import TaskSchema
 
-from ...core import tasks
+from .. import tasks
 
 
 class TaskList(View):

src/labthings/extensions.py

@@ -8,7 +8,7 @@
 import glob
 
 from .view.builder import static_from
-from ..core.utilities import get_docstring, camel_to_snake, snake_to_spine
+from .utilities import get_docstring, camel_to_snake, snake_to_spine
 
 
 class BaseExtension:

src/labthings/labthing.py

@@ -28,7 +28,7 @@
 from .default_views.root import RootView
 from .default_views.sockets import socket_handler
 
-from labthings.core.utilities import camel_to_snake
+from .utilities import camel_to_snake
 
 from typing import Callable
 

src/labthings/representations.py

@@ -7,7 +7,7 @@
 import cbor2
 
 
-from ..core.utilities import PY3
+from .utilities import PY3
 
 
 class LabThingsJSONEncoder(JSONEncoder):

src/labthings/spec/apispec.py

@@ -2,7 +2,7 @@
 from .paths import rule_to_path, rule_to_params
 from .utilities import convert_to_schema_or_json
 
-from labthings.core.utilities import get_docstring, get_summary
+from ..utilities import get_docstring, get_summary
 
 from werkzeug.routing import Rule
 from http import HTTPStatus

src/labthings/spec/apispec_plugins.py

@@ -2,7 +2,7 @@
     MarshmallowPlugin as _MarshmallowPlugin,
     OpenAPIConverter,
 )
-from labthings.server.fields import Bytes as BytesField
+from ..fields import Bytes as BytesField
 
 
 class ExtendedOpenAPIConverter(OpenAPIConverter):

src/labthings/spec/td.py

@@ -13,7 +13,7 @@
 
 from ..find import current_labthing
 
-from labthings.core.utilities import get_docstring, snake_to_camel
+from ..utilities import get_docstring, snake_to_camel
 
 
 def build_forms_for_view(rules: list, view: View, op: list):

src/labthings/view/__init__.py

@@ -13,8 +13,7 @@
 from ..find import current_labthing
 from ..event import PropertyStatusEvent
 from ..schema import Schema, ActionSchema, build_action_schema
-
-from labthings.core.tasks import taskify
+from ..tasks import taskify
 
 from gevent.timeout import Timeout