mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-05 09:02:13 +00:00
Merge pull request #4163 from matrix-org/rav/fix_consent_on_py3
Fix encoding error for consent form on python3
This commit is contained in:
commit
c70809a275
1
changelog.d/4163.bugfix
Normal file
1
changelog.d/4163.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
Generating the user consent URI no longer fails on Python 3.
|
@ -121,16 +121,15 @@ def parse_string(request, name, default=None, required=False,
|
|||||||
|
|
||||||
Args:
|
Args:
|
||||||
request: the twisted HTTP request.
|
request: the twisted HTTP request.
|
||||||
name (bytes/unicode): the name of the query parameter.
|
name (bytes|unicode): the name of the query parameter.
|
||||||
default (bytes/unicode|None): value to use if the parameter is absent,
|
default (bytes|unicode|None): value to use if the parameter is absent,
|
||||||
defaults to None. Must be bytes if encoding is None.
|
defaults to None. Must be bytes if encoding is None.
|
||||||
required (bool): whether to raise a 400 SynapseError if the
|
required (bool): whether to raise a 400 SynapseError if the
|
||||||
parameter is absent, defaults to False.
|
parameter is absent, defaults to False.
|
||||||
allowed_values (list[bytes/unicode]): List of allowed values for the
|
allowed_values (list[bytes|unicode]): List of allowed values for the
|
||||||
string, or None if any value is allowed, defaults to None. Must be
|
string, or None if any value is allowed, defaults to None. Must be
|
||||||
the same type as name, if given.
|
the same type as name, if given.
|
||||||
encoding: The encoding to decode the name to, and decode the string
|
encoding (str|None): The encoding to decode the string content with.
|
||||||
content with.
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
bytes/unicode|None: A string value or the default. Unicode if encoding
|
bytes/unicode|None: A string value or the default. Unicode if encoding
|
||||||
|
@ -160,7 +160,9 @@ class ConsentResource(Resource):
|
|||||||
try:
|
try:
|
||||||
self._render_template(
|
self._render_template(
|
||||||
request, "%s.html" % (version,),
|
request, "%s.html" % (version,),
|
||||||
user=username, userhmac=userhmac, version=version,
|
user=username,
|
||||||
|
userhmac=userhmac.decode('ascii'),
|
||||||
|
version=version,
|
||||||
has_consented=has_consented, public_version=public_version,
|
has_consented=has_consented, public_version=public_version,
|
||||||
)
|
)
|
||||||
except TemplateNotFound:
|
except TemplateNotFound:
|
||||||
|
Loading…
Reference in New Issue
Block a user