Commit fead4af1 authored by Levin Zimmermann's avatar Levin Zimmermann

Revert "fixup! Y client: Fix URI scheme to move credentials out of query"

This reverts commit cf685fb5. This used
to be a divergence between NEO/py and NEO/go, however in nexedi/neoppod!18 and
nexedi/neoppod!21 a common
solution for a zurl format was found. This common format keeps
credentials in the query, therefore we should revert patch
cf685fb5.
parent fe6ab177
...@@ -84,7 +84,6 @@ def _resolve_uri(uri): ...@@ -84,7 +84,6 @@ def _resolve_uri(uri):
if scheme != "neos": if scheme != "neos":
raise ValueError("invalid uri: %s : credentials can be specified only with neos:// scheme" % uri) raise ValueError("invalid uri: %s : credentials can be specified only with neos:// scheme" % uri)
# ca=ca.crt;cert=my.crt;key=my.key # ca=ca.crt;cert=my.crt;key=my.key
cred = cred.replace(';', '&') # ; is no longer in default separators set bugs.python.org/issue42967
for k, v in OrderedDict(parse_qsl(cred)).items(): for k, v in OrderedDict(parse_qsl(cred)).items():
if k not in _credopts: if k not in _credopts:
raise ValueError("invalid uri: %s : unexpected credential %s" % (uri, k)) raise ValueError("invalid uri: %s : unexpected credential %s" % (uri, k))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment