diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-28 08:13:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-28 08:13:46 +0000 |
| commit | 4b3e33b3c28892616d42cf3f1497dd8db63c783b (patch) | |
| tree | 35e3421bf56bc0bf46f9d006f192382c88ccf9da /swiftclient | |
| parent | 9021a58c240e156f54ffafdc4609868f348d3ebc (diff) | |
| parent | 3b21157a844be5b71fba2216486c3ef412e7ae1a (diff) | |
| download | python-swiftclient-4b3e33b3c28892616d42cf3f1497dd8db63c783b.tar.gz | |
Merge "Clean up warnings from newer flake8"
Diffstat (limited to 'swiftclient')
| -rw-r--r-- | swiftclient/client.py | 2 | ||||
| -rw-r--r-- | swiftclient/service.py | 1 | ||||
| -rwxr-xr-x | swiftclient/shell.py | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index 4406689..f071182 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -39,7 +39,7 @@ from swiftclient.utils import ( # Default is 100, increase to 256 http_client._MAXHEADERS = 256 -VERSIONFUL_AUTH_PATH = re.compile('v[2-3](?:\.0)?$') +VERSIONFUL_AUTH_PATH = re.compile(r'v[2-3](?:\.0)?$') AUTH_VERSIONS_V1 = ('1.0', '1', 1) AUTH_VERSIONS_V2 = ('2.0', '2', 2) AUTH_VERSIONS_V3 = ('3.0', '3', 3) diff --git a/swiftclient/service.py b/swiftclient/service.py index 3ea7f61..06de091 100644 --- a/swiftclient/service.py +++ b/swiftclient/service.py @@ -174,6 +174,7 @@ def _build_default_global_options(): 'container_threads': 10 } + _default_global_options = _build_default_global_options() _default_local_options = { diff --git a/swiftclient/shell.py b/swiftclient/shell.py index 9ea5e95..0459533 100755 --- a/swiftclient/shell.py +++ b/swiftclient/shell.py @@ -58,6 +58,7 @@ def immediate_exit(signum, frame): stderr.write(" Aborted\n") os_exit(2) + st_delete_options = '''[--all] [--leave-segments] [--object-threads <threads>] [--container-threads <threads>] |