Browse Source

HUE-8738 [task] Avoid blind TypeError concatenating 'NoneType' and 'str'

Romain 5 years ago
parent
commit
5b48b92029
1 changed files with 7 additions and 2 deletions
  1. 7 2
      desktop/libs/notebook/src/notebook/tasks.py

+ 7 - 2
desktop/libs/notebook/src/notebook/tasks.py

@@ -488,9 +488,14 @@ def _cleanup(notebook, snippet):
 
 
 def _get_query_key(notebook, snippet):
 def _get_query_key(notebook, snippet):
   if ENABLE_NOTEBOOK_2.get():
   if ENABLE_NOTEBOOK_2.get():
-    return snippet['executor']['executables'][0].get('history', {}).get('uuid')
+    query_key = snippet['executor']['executables'][0].get('history', {}).get('uuid')
   else:
   else:
-    return notebook['uuid']
+    query_key = notebook['uuid']
+
+  if not query_key:
+    raise QueryError()
+  else:
+    return query_key
 
 
 def _log_key(notebook, snippet):
 def _log_key(notebook, snippet):
   return _get_query_key(notebook, snippet) + '_log'
   return _get_query_key(notebook, snippet) + '_log'