run long requests on second thread (tableau#1212)

jacalata · jacalata · commit f94f72d7dd82 · 2023-09-21T21:11:21.000-07:00
* run long requests on second thread
* improve chunked upload requests
* begin extracting constants for user editing
* centrally configured logger
diff --git a/tableauserverclient/server/endpoint/favorites_endpoint.py b/tableauserverclient/server/endpoint/favorites_endpoint.py
@@ -1,4 +1,5 @@
 from .endpoint import Endpoint, api
+<<<<<<< HEAD
 from requests import Response
 
 from tableauserverclient.helpers.logging import logger
@@ -16,6 +17,18 @@
 )
 from tableauserverclient.server import RequestFactory, RequestOptions
 from typing import Optional
+=======
+from tableauserverclient.server import RequestFactory
+from tableauserverclient.models import FavoriteItem
+
+from typing import Optional, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ...models import DatasourceItem, FlowItem, ProjectItem, UserItem, ViewItem, WorkbookItem
+    from ..request_options import RequestOptions
+
+from tableauserverclient.helpers.logging import logger
+>>>>>>> 3cc28be (run long requests on second thread (#1212))
 
 
 class Favorites(Endpoint):
