The only thing I found was really minor, and probably not worth holding back the patch since it's only a doc string and could be improved at a later time. So I will give my +1 for the patch, but maybe consider the following:
In swift/common/middleware/tempurl.py
I think the example return value for _get_keys was a little confusing due to missing ')' for *-Key-2 examples.
~ 471 :returns: [
~ 472 (X-Account-Meta-Temp-URL-Key str value, ACCOUNT_SCOPE) if set,
~ 473 (X-Account-Meta-Temp-URL-Key-2 str value, ACCOUNT_SCOPE if set,
+ 474 (X-Container-Meta-Temp-URL-Key str value, CONTAINER_SCOPE) if set,
+ 475 (X-Container-Meta-Temp-URL-Key-2 str value, CONTAINER_SCOPE if set,
+ 476 ]
Something like the following might be a little clearer IMO:
~ 471 :returns: List of tuples for each key set. Where the tuple
~ 472 consists of the str value of *-Meta-Temp-Url-Key and
~ 473 the scope of the key.
+ 474 Example: [
+ 475 (X-Account-Meta-Temp-URL-Key value, ACCOUNT_SCOPE),
+ 476 (X-Account-Meta-Temp-URL-Key-2 value, ACCOUNT_SCOPE),
+ 477 (X-Container-Meta-Temp-URL-Key value, CONTAINER_SCOPE),
+ 478 (X-Container-Meta-Temp-URL-Key-2 value, CONTAINER_SCOPE),
+ 479 ]
Sam: Sorry it took so long.
The only thing I found was really minor, and probably not worth holding back the patch since it's only a doc string and could be improved at a later time. So I will give my +1 for the patch, but maybe consider the following:
In swift/common/ middleware/ tempurl. py Meta-Temp- URL-Key str value, ACCOUNT_SCOPE) if set, Meta-Temp- URL-Key- 2 str value, ACCOUNT_SCOPE if set, Meta-Temp- URL-Key str value, CONTAINER_SCOPE) if set, Meta-Temp- URL-Key- 2 str value, CONTAINER_SCOPE if set,
I think the example return value for _get_keys was a little confusing due to missing ')' for *-Key-2 examples.
~ 471 :returns: [
~ 472 (X-Account-
~ 473 (X-Account-
+ 474 (X-Container-
+ 475 (X-Container-
+ 476 ]
Something like the following might be a little clearer IMO: Meta-Temp- URL-Key value, ACCOUNT_SCOPE), Meta-Temp- URL-Key- 2 value, ACCOUNT_SCOPE), Meta-Temp- URL-Key value, CONTAINER_SCOPE), Meta-Temp- URL-Key- 2 value, CONTAINER_SCOPE),
~ 471 :returns: List of tuples for each key set. Where the tuple
~ 472 consists of the str value of *-Meta-Temp-Url-Key and
~ 473 the scope of the key.
+ 474 Example: [
+ 475 (X-Account-
+ 476 (X-Account-
+ 477 (X-Container-
+ 478 (X-Container-
+ 479 ]