openstack/swift
Code Issues Proposed changes

Merge "Trivial fix for decrypter docstrings"

Browse Source
This commit is contained in:
Jenkins
2017-05-04 13:45:03 +00:00
committed by Gerrit Code Review
parent dd3bc8fe61 88ca232e52
commit dad1951ea8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/crypto/decrypter.py
View File

@@ -233,7 +233,7 @@ class DecrypterObjContext(BaseDecrypterContext):
:param resp: application response :param resp: application response
:param boundary: multipart boundary string :param boundary: multipart boundary string
:param body_key: a dict of decryption keys. :param body_key: decryption key for the response body
:param crypto_meta: crypto_meta for the response body :param crypto_meta: crypto_meta for the response body
:return: generator for decrypted response body :return: generator for decrypted response body
""" """
@@ -262,7 +262,7 @@ class DecrypterObjContext(BaseDecrypterContext):
Decrypts a response body. Decrypts a response body.
:param resp: application response :param resp: application response
:param body_key: a dict of decryption keys. :param body_key: decryption key for the response body
:param crypto_meta: crypto_meta for the response body :param crypto_meta: crypto_meta for the response body
:param offset: offset into object content at which response body starts :param offset: offset into object content at which response body starts
:return: generator for decrypted response body :return: generator for decrypted response body

1
swift/proxy/controllers/base.py
View File

@@ -505,6 +505,7 @@ def set_object_info_cache(app, env, account, container, obj, resp):
per-request cache only. per-request cache only.
:param app: the application object :param app: the application object
:param env: the environment used by the current request
:param account: the unquoted account name :param account: the unquoted account name
:param container: the unquoted container name :param container: the unquoted container name
:param obj: the unquoted object name :param obj: the unquoted object name