Skip to content

Commit 1831bcc

Browse files
author
Joel Collins
committed
Code formatting
1 parent b1d8bb2 commit 1831bcc

30 files changed

+116
-92
lines changed

examples/nested_thing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __init__(self):
3535
def noisy_pdf(self, x_value, mu=0.0, sigma=25.0):
3636
"""
3737
Generate a noisy gaussian function (to act as some pretend data)
38-
38+
3939
Our noise is inversely proportional to self.magic_denoise
4040
"""
4141
x_value = float(x_value - mu) / sigma

examples/simple_extensions.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ class ExtensionMeasurementAction(ActionView):
1919

2020
args = {
2121
"averages": fields.Integer(
22-
missing=10, example=10, description="Number of data sets to average over",
22+
missing=10,
23+
example=10,
24+
description="Number of data sets to average over",
2325
)
2426
}
2527

@@ -66,7 +68,7 @@ def __init__(self):
6668
def noisy_pdf(self, x, mu=0.0, sigma=25.0):
6769
"""
6870
Generate a noisy gaussian function (to act as some pretend data)
69-
71+
7072
Our noise is inversely proportional to self.magic_denoise
7173
"""
7274
x = float(x - mu) / sigma

examples/simple_thing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env python
22

3+
import logging
4+
35
from labthings import ActionView, PropertyView, create_app, fields, find_component, op
46
from labthings.example_components import PretendSpectrometer
57

6-
import logging
7-
88
"""
99
Class for our lab component functionality. This could include serial communication,
1010
equipment API calls, network requests, or a "virtual" device as seen here.

src/labthings/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from .sync import ClientEvent, CompositeLock, StrictLock
3131

3232
# Views
33-
from .views import ActionView, PropertyView, EventView, op
33+
from .views import ActionView, EventView, PropertyView, op
3434

3535
# Suggested WSGI server class
3636
from .wsgi import Server

src/labthings/actions/thread.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import traceback
66
import uuid
77

8-
from flask import request, copy_current_request_context, has_request_context
8+
from flask import copy_current_request_context, has_request_context, request
99
from werkzeug.exceptions import BadRequest
1010

11-
from ..utilities import TimeoutTracker
1211
from ..deque import LockableDeque
12+
from ..utilities import TimeoutTracker
1313

1414
_LOG = logging.getLogger(__name__)
1515

src/labthings/apispec/plugins.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
from .. import fields
99
from ..json.schemas import schema_to_json
10-
from ..schema import build_action_schema, EventSchema
10+
from ..schema import EventSchema, build_action_schema
1111
from ..utilities import get_docstring, get_summary, merge
12-
from ..views import ActionView, PropertyView, EventView, View
12+
from ..views import ActionView, EventView, PropertyView, View
1313

1414

1515
class ExtendedOpenAPIConverter(OpenAPIConverter):

src/labthings/example_components/spectrometer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def __init__(self):
1717
def make_spectrum(self, x, mu=0.0, sigma=25.0):
1818
"""
1919
Generate a noisy gaussian function (to act as some pretend data)
20-
20+
2121
Our noise is inversely proportional to self.integration_time
2222
"""
2323
x = float(x - mu) / sigma

src/labthings/extensions.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class BaseExtension:
1515
"""Parent class for all extensions.
16-
16+
1717
Handles binding route views and forms.
1818
1919
@@ -65,10 +65,10 @@ def views(self):
6565
def add_view(self, view_class, *urls, endpoint=None, **kwargs):
6666
"""
6767
68-
:param view_class:
69-
:param *urls:
68+
:param view_class:
69+
:param *urls:
7070
:param endpoint: (Default value = None)
71-
:param **kwargs:
71+
:param **kwargs:
7272
7373
"""
7474
# Remove all leading slashes from view route
@@ -99,7 +99,7 @@ def add_view(self, view_class, *urls, endpoint=None, **kwargs):
9999
def on_register(self, function, args=None, kwargs=None):
100100
"""
101101
102-
:param function:
102+
:param function:
103103
:param args: (Default value = None)
104104
:param kwargs: (Default value = None)
105105
@@ -114,8 +114,8 @@ def on_register(self, function, args=None, kwargs=None):
114114
def on_component(self, component_name: str, function, args=None, kwargs=None):
115115
"""
116116
117-
:param component_name: str:
118-
:param function:
117+
:param component_name: str:
118+
:param function:
119119
:param args: (Default value = None)
120120
:param kwargs: (Default value = None)
121121
@@ -146,8 +146,8 @@ def meta(self):
146146
def add_meta(self, key, val):
147147
"""
148148
149-
:param key:
150-
:param val:
149+
:param key:
150+
:param val:
151151
152152
"""
153153
self._meta[key] = val
@@ -172,8 +172,8 @@ def _name_uri_safe(self):
172172
def add_method(self, method, method_name):
173173
"""
174174
175-
:param method:
176-
:param method_name:
175+
:param method:
176+
:param method_name:
177177
178178
"""
179179
self.methods[method_name] = method
@@ -188,7 +188,7 @@ def add_method(self, method, method_name):
188188
def static_file_url(self, filename: str):
189189
"""
190190
191-
:param filename: str:
191+
:param filename: str:
192192
193193
"""
194194
static_repr = self.views.get("static")
@@ -228,7 +228,7 @@ def find_extensions_in_file(extension_path: str, module_name="extensions") -> li
228228
:param module_name: Name of the module to load extensions into.
229229
Defaults to "extensions".
230230
:type module_name: str
231-
:param extension_path: str:
231+
:param extension_path: str:
232232
:returns: List of extension objects
233233
:rtype: list
234234
@@ -261,7 +261,7 @@ def find_extensions(extension_dir: str, module_name="extensions") -> list:
261261
:param module_name: Name of the module to load extensions into.
262262
Defaults to "extensions".
263263
:type module_name: str
264-
:param extension_dir: str:
264+
:param extension_dir: str:
265265
:returns: List of extension objects
266266
:rtype: list
267267

src/labthings/fields.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def _jsonschema_type_mapping(self):
8282
def _validate(self, value):
8383
"""
8484
85-
:param value:
85+
:param value:
8686
8787
"""
8888
if not isinstance(value, bytes):
@@ -94,10 +94,10 @@ def _validate(self, value):
9494
def _deserialize(self, value, attr, data, **kwargs):
9595
"""
9696
97-
:param value:
98-
:param attr:
99-
:param data:
100-
:param **kwargs:
97+
:param value:
98+
:param attr:
99+
:param data:
100+
:param **kwargs:
101101
102102
"""
103103
if isinstance(value, bytes):

src/labthings/find.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
def current_labthing(app=None):
2020
"""The LabThing instance handling current requests.
21-
21+
2222
Searches for a valid LabThing extension attached to the current Flask context.
2323
2424
:param app: (Default value = None)

0 commit comments

Comments
 (0)