Skip to content

Commit b7150ee

Browse files
author
Joel Collins
committed
Fixed blueprint interface
1 parent cd71fc4 commit b7150ee

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

labthings/server/sockets/base.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ def property_notify(self, viewcls):
2020
else:
2121
property_value = None
2222

23-
property_name = str(getattr(viewcls, "endpoint", "unknown"))
23+
property_name = getattr(viewcls, "endpoint", None) or getattr(
24+
viewcls, "__name__", "unknown"
25+
)
2426

2527
response = encode_json(
2628
{"messageType": "propertyStatus", "data": {property_name: property_value}}
@@ -54,18 +56,18 @@ def __init__(self, app=None):
5456

5557
@abstractmethod
5658
def init_app(self, app):
57-
pass
59+
"Registers Flask middleware"
5860

5961
def route(self, rule, **options):
60-
def decorator(view_func):
61-
options.pop("endpoint", None)
62-
self.add_url_rule(rule, view_func, **options)
63-
return view_func
62+
def decorator(f):
63+
endpoint = options.pop("endpoint", None)
64+
self.add_url_rule(rule, endpoint, f, **options)
65+
return f
6466

6567
return decorator
6668

67-
def add_url_rule(self, rule, view_func, **options):
68-
self.url_map.add(Rule(rule, endpoint=view_func))
69+
def add_url_rule(self, rule, _, f, **options):
70+
self.url_map.add(Rule(rule, endpoint=f))
6971

7072
def register_blueprint(self, blueprint, **options):
7173
"""

0 commit comments

Comments
 (0)