Merge pull request #74 from PanDAWMS/api_init

panda_api: initialize username and better handling of task-vs-username parameter handling in show()

Author: fbarreir

pandaclient/PBookCore.py

@@ -317,7 +317,10 @@ def show(
     ):
         # user name
         if username is None:
-            username = self.username
+            # if the task ID or task name are specified, ignore the username to avoid strange behaviour
+            if not some_ids and not taskname and not jeditaskid:
+                username = self.username
+
         # shortcut of jeditaskid and reqid
         if isinstance(some_ids, (int, long)):
             if is_reqid(some_ids):

pandaclient/PandaToolsPkgInfo.py

@@ -1 +1 @@
-release_version = "1.6.12"
+release_version = "1.6.13"

pandaclient/panda_api.py

@@ -94,6 +94,7 @@ def get_tasks(self, task_ids=None, limit=1000, days=14, status=None, username=No
         """
         if not self.pbook:
             self.pbook = PBookCore.PBookCore()
+            self.pbook.init()
         return self.pbook.show(task_ids, limit=limit, days=days, format="json", status=status, username=username)
 
     # show tasks
@@ -111,6 +112,7 @@ def show_tasks(self, task_ids=None, limit=1000, days=14, format="standard", stat
         """
         if not self.pbook:
             self.pbook = PBookCore.PBookCore()
+            self.pbook.init()
         self.pbook.show(task_ids, limit=limit, days=days, format=format, status=status, username=username)
 
     # submit a task
@@ -141,6 +143,7 @@ def get_job_metadata(self, task_id, output_json_filename):
         """
         if not self.pbook:
             self.pbook = PBookCore.PBookCore()
+            self.pbook.init()
         return self.pbook.getUserJobMetadata(task_id, output_json_filename)
 
     # execute xyz