Chore/python3 #39
Merged
Chore/python3 #39
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The style in this PR agrees with This formatting comment was generated automatically by a script in uc-cdis/wool. |
fantix
suggested changes
Jul 1, 2019
| @@ -7,8 +7,9 @@ | |||
| try: | |||
| from urllib.parse import urlparse, parse_qs, quote, unquote, quote_plus | |||
| except ImportError: | |||
| from urlparse import urlparse, parse_qs | |||
| from urllib import quote, unquote, quote_plus | |||
There was a problem hiding this comment.
This was Python 3 compatible, 2to3 is not smart enough.
There was a problem hiding this comment.
oh, right, i will just remove the try except since we don't need to support python 2 anymore
cdispyutils/auth/jwt_validation.py
Outdated
| else: | ||
| # Grab the key from the first in the list of keys. | ||
| return flask.current_app.jwt_public_keys.items()[0][1] | ||
| return list(flask.current_app.jwt_public_keys.items())[0][1] |
There was a problem hiding this comment.
How about:
next(iter(flask.current_app.jwt_public_keys.values()))| @@ -224,7 +224,7 @@ def get_canonical_headers(req, include=None): | |||
| # Requests, since it uses a case-insensitive dict to hold headers, this | |||
| # is here just in case you duck type with a regular dict | |||
| cano_headers_dict = {} | |||
| for hdr, val in headers.items(): | |||
| for hdr, val in list(headers.items()): | |||
| @@ -280,7 +280,7 @@ def format_cano_path(path): | |||
| qm = b'?' if PY2 else '?' | |||
| full_path = qm.join((full_path, qs)) | |||
| if PY2: | |||
There was a problem hiding this comment.
Do we still need these if PY2?
test/auth/conftest.py
Outdated
| @@ -167,7 +161,8 @@ def auth_header(encoded_jwt): | |||
| Return: | |||
| List[Tuple[str, str]]: the authorization header | |||
| """ | |||
| return [('Authorization', 'Bearer %s' % encoded_jwt)] | |||
| encoded_jwt = encoded_jwt.decode("utf-8") | |||
| return auth_str | ||
|
|
||
|
|
||
| def generate_signature(secret_key, sig_string): | ||
| if isinstance(secret_key, str): | ||
| secret_key = bytes(secret_key, "latin-1") |
There was a problem hiding this comment.
secret_key.encode("latin-1")? Identical but consistent 🙊
.travis.yml
Outdated
| @@ -25,7 +29,7 @@ deploy: | |||
| env: | |||
| global: | |||
| - PIPENV_IGNORE_VIRTUALENVS=1 | |||
| - secure: ov66mTdCG+Gl+wLAjYdqR0HrKbgpQFSxSgCi0ihTmErzQl/vudZyPXdoSEQfFsWpKGI+UmhYklsvGySnYzyhTuUTrmovQ5C9tMMASWtJrwzAgun6PIli7ETjw5j273WTwIPy/HfrysqW6ab563VYbbuxn7ZANV86wN17TKp0qyaJPD4Kc6iFp8yKei7msXPy6Pc36AYz4vVjq1AZasFLIrRy5va4VNxtNUvK4peOdKcxDTmj4GMS8eF/Y55HuOzuH/B3hw0XqCgwk+u+4DCImpvQIhsfChgI71m70/scWwhiSaVY3WEmZBbJPgFLsoBm+div2+kG8zcNvOK2OEhQgvocxzgpTik5rvZX2SRCpuBxgbZEzUEbvNPArJVLwOBlbadIpuM8+sHTj/2A/4+AboVat10jjHrevTKlCo6CXe2QPXO474eZP0f5lOsGRQ9iSW52MRRCt8yOIALWwmn5DDrwt41ezn5+JDglxPxebqFLuvutG/7XMhhCuU91MYLxI/xhliRcYL9SiZXjnEz0p91YUNQQ2seJNvw/d65ypYdJDqS8kM8II7+lL/9l41hZ2En3LDSQ5diXPzEeNVp5cz/mn2rwlehTLmGbdb0Qy3WbD9eKoY1ADR+yDTE9l3t9UtRqkJ6Jgdig1YNkmdaFmrMfMHzTntY5He78b95zyk8= | |||
| - secure: qoMlJG2/e/ExVimSYtWbFxaePA7wSUgjsENaJPmAZKvisaSmbh3+BjlGc0128NViYGXMg2ljk2ofzST7/ktlJhnfewFrVHMctJsDppC0cmYXYQsXdGlFC59UDZXzp+jj4dRVSBiFUbIcznQDuGQ9z9rZs/dAHxPyVfgZoKbvuAiW+vNh+9veVvMfTFdSl6xNC4VBAk1BSWwRgYzYRyUFCXTmX+LbKN6SbyXpZXEwHoLCzKGePDK4SOHeFMSVhPryWtID1aCZYHHRm1ctFTjgvuAJ6s58Tlui5K9w4LFzlyhbWPE/T42cO1Azuqm+T/UZkD9k//rIj6yZb+JuxTNaIhosmB83MYzD/XhOEqCKoUjvYAHT1FwVpuml8/lm16EEloerag6yudAuVwerOQtPp3bcYANtKy78dLtVbu6AUDlpgjy3TELR60n02JDP2C5eu/3Bf2yLY3zOgshWluq6pTgX1PDaBgVL6PwDjnGtWI4Xpblt56rCYKvqHVqkQJzmTGP6epooiNEKaWy9tSo4aHRw82uzqOJY7Y3vr2eJ1vUtV5MBTSDnZyclRvEJA+qB6vHHSO7FRzTnzdvRmCO2VFOF+VfRGk8p331bBhotHIKxu5SwYxG97L8QuS4H9yni9zw039tCqluj2sEZ2xER/2AWCFtayty5ldz1SXIyY6U= | |||
There was a problem hiding this comment.
I cannot decrypt, but I think it is a change like this:
-GH_TOKEN=xxxx
+GITHUB_TOKEN=xxxWe actually need both GH_TOKEN - gen3git needs the first one (perhaps it is even better to make gen3git support both)
fantix
approved these changes
Jul 1, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Breaking Changes