Skip to content

code cleanup in drone.py #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cmarshall108 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

code cleanup in drone.py #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions udacidrone/drone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,10 @@ def register_callback(self, name, fn):

These can be added anywhere in the code and are identical to initializing a callback with the decorator
"""
if name not in self._callbacks:
self._callbacks[name] = []
if fn not in self._callbacks[name]:
self._callbacks[name].append(fn)

callbacks = self._callbacks.setdefault(name, [])
if fn not in callbacks:
callbacks.append(fn)

def remove_callback(self, name, fn):
"""Remove the function, `fn`, as a callback for the message type, `name`
Expand All @@ -364,11 +364,13 @@ def remove_callback(self, name, fn):
self.remove_message_listener(MsgID.GLOBAL_POSITION, global_msg_listener)

"""
if name in self._callbacks:
if fn in self._callbacks[name]:
self._callbacks[name].remove(fn)
if len(self._callbacks[name]) == 0:
del self._callbacks[name]

callbacks = self._callbacks.get(name, [])
if fn in callbacks:
callbacks.remove(fn)

if not len(self._callbacks[name]):
del self._callbacks[name]

def notify_callbacks(self, name, msg):
"""Passes the message to the appropriate listeners"""
Expand Down