Skip to content

Commit 41b8ad1

Browse files
committed
feedback: Avoid using arbitrary special names
"Special" (dunder) names are reserved for use by Python.
1 parent 87d98e3 commit 41b8ad1

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

magicbot/magic_tunable.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ class MyRobot(magicbot.MagicRobot):
182182
raise ValueError("{} may not take arguments other than 'self' (must be a simple getter method)".format(name))
183183

184184
# Set attributes to be checked during injection
185-
f.__feedback__ = True
186-
f.__key__ = key
185+
f._magic_feedback = True
186+
f._magic_feedback_key = key
187187

188188
return f
189189

@@ -200,18 +200,19 @@ def collect_feedbacks(component, cname: str, prefix='components'):
200200
else:
201201
prefix = '/%s/%s' % (prefix, cname)
202202

203+
nt = NetworkTables.getTable(prefix)
203204
feedbacks = []
204205

205206
for name, method in inspect.getmembers(component, inspect.ismethod):
206-
if getattr(method, '__feedback__', False):
207-
key = method.__key__
207+
if getattr(method, '_magic_feedback', False):
208+
key = method._magic_feedback_key
208209
if key is None:
209210
if name.startswith('get_'):
210211
key = name[4:]
211212
else:
212213
key = name
213214

214-
entry = NetworkTables.getEntry('%s/%s' % (prefix, key))
215+
entry = nt.getEntry(key)
215216
feedbacks.append((method, entry))
216217

217218
return feedbacks

0 commit comments

Comments
 (0)