Renamed labthings.view to labthings.views

Author: Joel Collins

src/labthings/__init__.py

@@ -1,5 +1,14 @@
 from .labthing import LabThing
 from .wsgi import Server
-from . import sync, fields, schema, semantics, quick
+from . import views, sync, fields, schema, semantics, quick
 
-__all__ = ["LabThing", "Server", "sync", "fields", "schema", "semantics", "quick"]
+__all__ = [
+    "LabThing",
+    "Server",
+    "views",
+    "sync",
+    "fields",
+    "schema",
+    "semantics",
+    "quick",
+]

src/labthings/default_views/actions.py

@@ -1,8 +1,8 @@
 from flask import abort
 
-from ..view import View
-from ..view.marshalling import marshal_with
-from ..view.args import use_args
+from ..views import View
+from ..views.marshalling import marshal_with
+from ..views.args import use_args
 from ..schema import ActionSchema
 from ..find import current_thing
 from .. import fields

src/labthings/default_views/docs/__init__.py

@@ -1,6 +1,6 @@
 from flask import render_template, Blueprint, make_response
 
-from ...view import View
+from ...views import View
 from ...find import current_thing
 
 

src/labthings/default_views/extensions.py

@@ -1,5 +1,5 @@
 """Top-level representation of attached and enabled Extensions"""
-from ..view import View
+from ..views import View
 from ..find import registered_extensions
 from ..schema import ExtensionSchema
 

src/labthings/default_views/root.py

@@ -1,5 +1,5 @@
 from ..find import current_thing
-from ..view import View
+from ..views import View
 
 
 class RootView(View):

src/labthings/default_views/tasks.py

@@ -1,8 +1,8 @@
 from flask import abort
 import logging
 
-from ..view import View
-from ..view.marshalling import marshal_with
+from ..views import View
+from ..views.marshalling import marshal_with
 from ..schema import TaskSchema
 from ..find import current_thing
 

src/labthings/extensions.py

@@ -7,7 +7,7 @@
 import os
 import glob
 
-from .view.builder import static_from
+from .views.builder import static_from
 from .utilities import get_docstring, camel_to_snake, snake_to_spine
 
 

src/labthings/labthing.py

@@ -24,7 +24,7 @@
 
 from .tasks import Pool
 
-from .view.builder import property_of, action_from
+from .views.builder import property_of, action_from
 
 from .default_views.extensions import ExtensionList
 from .default_views.tasks import TaskList, TaskView

src/labthings/td.py

@@ -1,6 +1,6 @@
 from flask import url_for, request
 
-from .view import View
+from .views import View
 from .event import Event
 from .json.schemas import schema_to_json
 from .json.paths import rule_to_params, rule_to_path

tests/conftest.py

@@ -3,13 +3,14 @@
 import json
 import jsonschema
 from flask import Flask
-from flask.views import MethodView
 from apispec import APISpec
 from apispec.ext.marshmallow import MarshmallowPlugin
 from labthings.server.labthing import LabThing
-from labthings.server.view import View
 from labthings.tasks import Pool
 
+from flask.views import MethodView
+from labthings.views import View
+
 from werkzeug.test import EnvironBuilder
 from flask.testing import FlaskClient