Fix type annotations on Job endpoint

jorwoods · jorwoods · commit 16469c3bfa5f · 2021-11-02T16:39:01.000-05:00
diff --git a/tableauserverclient/server/endpoint/jobs_endpoint.py b/tableauserverclient/server/endpoint/jobs_endpoint.py
@@ -8,9 +8,8 @@
 
 logger = logging.getLogger("tableau.endpoint.jobs")
 
-from typing import List, Optional, Tuple, TYPE_CHECKING, TypeVar
+from typing import List, Optional, Tuple, TYPE_CHECKING, Union
 
-T = TypeVar("T", int, float)
 
 
 class Jobs(Endpoint):
@@ -38,9 +37,11 @@ def get(
         return jobs, pagination_item
 
     @api(version="3.1")
-    def cancel(self, job_id: str):
-        id_ = getattr(job_id, "id", job_id)
-        url = "{0}/{1}".format(self.baseurl, id_)
+    def cancel(self, job_id: Union[str, JobItem]):
+        if isinstance(job_id, JobItem):
+            job_id = job_id.id
+        assert isinstance(job_id, str)
+        url = "{0}/{1}".format(self.baseurl, job_id)
         return self.put_request(url)
 
     @api(version="2.6")
@@ -51,7 +52,7 @@ def get_by_id(self, job_id: str) -> JobItem:
         new_job = JobItem.from_response(server_response.content, self.parent_srv.namespace)[0]
         return new_job
 
-    def wait_for_job(self, job_id: str, *, timeout: Optional[T] = None) -> JobItem:
+    def wait_for_job(self, job_id: Union[str, JobItem], *, timeout: Optional[float] = None) -> JobItem:
         if isinstance(job_id, JobItem):
             job_id = job_id.id
         assert isinstance(job_id, str)
