diff options
| author | Tim Burke <tim.burke@gmail.com> | 2019-08-01 21:07:43 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2019-08-07 12:17:38 -0700 |
| commit | 12bd870a02fc3528f45d27152c62fb0b9598bc84 (patch) | |
| tree | d9f236af435fa58e8c11dafc054dfa083f2b1232 /swiftclient | |
| parent | 093ee55c2be77fb53deab81fa7faf31ebfc39647 (diff) | |
| download | python-swiftclient-12bd870a02fc3528f45d27152c62fb0b9598bc84.tar.gz | |
Fix up stable gate
This is a combination of three commits from master:
---
Isolate docs requirements
...since modern sphinx won't install on py27.
While we're at it, clean up some warnings and treat warnings as errors.
Also, fix up how we parse test configs so we can run func tests.
Related-Change: Id3c2ed87230c5918c18e2c01d086df8157f036b1
(cherry picked from commit 113eacf3b80f61d366b3e95b558b40f82ff728a4)
---
Drag forward prettytable in lower-constraints
Apparently version 0.7 got unpublished recently.
(cherry picked from commit 5bd66947fc3d8987d4b24d5119a346031004229e)
---
docs: Clean up formatting
(cherry-picked from commit 7563d9cb5642c85a31708fd863e2737f9d6c9419)
---
Change-Id: I3c6bca460ee5ff99195495a29e8b8bbf4ed804ff
(cherry picked from commit 172aa9016977a3b03f07da0350c6aa9ade1e55a0)
Diffstat (limited to 'swiftclient')
| -rw-r--r-- | swiftclient/multithreading.py | 8 | ||||
| -rw-r--r-- | swiftclient/utils.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/swiftclient/multithreading.py b/swiftclient/multithreading.py index 5e03ed7..fcf0ed9 100644 --- a/swiftclient/multithreading.py +++ b/swiftclient/multithreading.py @@ -175,6 +175,14 @@ class ConnectionThreadPoolExecutor(ThreadPoolExecutor): super(ConnectionThreadPoolExecutor, self).__init__(max_workers) def submit(self, fn, *args, **kwargs): + """ + Schedules the callable, `fn`, to be executed + + :param fn: the callable to be invoked + :param args: the positional arguments for the callable + :param kwargs: the keyword arguments for the callable + :returns: a Future object representing the execution of the callable + """ def conn_fn(): priority = None conn = None diff --git a/swiftclient/utils.py b/swiftclient/utils.py index 5c17c61..87a4390 100644 --- a/swiftclient/utils.py +++ b/swiftclient/utils.py @@ -74,7 +74,7 @@ def generate_temp_url(path, seconds, key, method, absolute=False, Swift object. :param path: The full path to the Swift object or prefix if - a prefix-based temporary URL should be generated. Example: + a prefix-based temporary URL should be generated. Example: /v1/AUTH_account/c/o or /v1/AUTH_account/c/prefix. :param seconds: time in seconds or ISO 8601 timestamp. If absolute is False and this is the string representation of an |