athena: listUploadQueue, check None first

old-commit-hash: bde568205e
4 years ago · f78eacb3a5
parent e761c4da22
commit f78eacb3a5
1 changed files with 1 additions and 1 deletions
--- a/selfdrive/athena/athenad.py
+++ b/selfdrive/athena/athenad.py
@ -253,7 +253,7 @@ def uploadFileToUrl(fn, url, headers):
@dispatcher.add_method
 def listUploadQueue():
  items = list(upload_queue.queue) + list(cur_upload_items.values())
-  return [i._asdict() for i in items if i.id not in cancelled_uploads and i is not None]
+  return [i._asdict() for i in items if (i is not None) and (i.id not in cancelled_uploads)]
@dispatcher.add_method