@@ -148,19 +148,12 @@ def parse_string(
148148 )
149149
150150
151- def parse_string_value (
152- value ,
153- allowed_values ,
154- name = "" ,
155- encoding = "ascii"
156- ) -> str :
151+ def parse_string_value (value , allowed_values , name = "" , encoding = "ascii" ) -> str :
157152 if encoding :
158153 try :
159154 value = value .decode (encoding )
160155 except ValueError :
161- raise SynapseError (
162- 400 , "Query parameter %r must be %s" % (name , encoding )
163- )
156+ raise SynapseError (400 , "Query parameter %r must be %s" % (name , encoding ))
164157
165158 if allowed_values is not None and value not in allowed_values :
166159 message = "Query parameter %r must be one of [%s]" % (
@@ -171,6 +164,7 @@ def parse_string_value(
171164 else :
172165 return value
173166
167+
174168def parse_strings_from_args (
175169 args ,
176170 name ,
@@ -187,7 +181,10 @@ def parse_strings_from_args(
187181 if name in args :
188182 values = args [name ]
189183
190- return [parse_string_value (value , allowed_values , name = name , encoding = encoding ) for value in values ]
184+ return [
185+ parse_string_value (value , allowed_values , name = name , encoding = encoding )
186+ for value in values
187+ ]
191188 else :
192189 if required :
193190 message = "Missing %s query parameter %r" % (param_type , name )
@@ -218,13 +215,14 @@ def parse_string_from_args(
218215 param_type = param_type ,
219216 encoding = encoding ,
220217 )
221-
218+
222219 if isinstance (strings , list ) and len (strings ):
223220 return strings [0 ]
224221
225222 # Return the default
226223 return strings
227224
225+
228226def parse_json_value_from_request (request , allow_empty_body = False ):
229227 """Parse a JSON value from the body of a twisted HTTP request.
230228
@@ -279,6 +277,7 @@ def parse_json_object_from_request(request, allow_empty_body=False):
279277
280278 return content
281279
280+
282281def assert_params_in_dict (body , required ):
283282 absent = []
284283 for k in required :
0 commit comments