Skip to content

Commit 1935756

Browse files
author
Joel Collins
committed
Moved marshalling into a submodule
1 parent 446f282 commit 1935756

File tree

6 files changed

+7
-3
lines changed

6 files changed

+7
-3
lines changed

src/labthings/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
# Submodules
3333
from . import extensions
3434
from . import views
35+
from . import marshalling
3536
from . import semantics
3637
from . import json
3738

src/labthings/default_views/actions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from flask import abort
22

33
from ..views import View
4-
from ..views.args import use_args
4+
from ..marshalling import use_args
55
from ..schema import ActionSchema
66
from ..find import current_labthing
77
from .. import fields
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
from .args import use_args
2+
from .marshalling import marshal_with
3+
4+
__all__ = ["use_args", "marshal_with"]
File renamed without changes.
File renamed without changes.

src/labthings/views/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
from werkzeug.exceptions import BadRequest
55
from collections import OrderedDict
66

7-
from .args import use_args
8-
from .marshalling import marshal_with
7+
from ..marshalling import use_args, marshal_with
98

109
from . import op
1110

0 commit comments

Comments
 (0)