Make name str always.

Author: clokep

synapse/http/servlet.py

@@ -15,7 +15,7 @@
 """ This module contains base REST classes for constructing REST servlets. """
 
 import logging
-from typing import Dict, Iterable, List, Optional, Union, overload
+from typing import Dict, Iterable, List, Optional, overload
 
 from typing_extensions import Literal
 
@@ -166,7 +166,7 @@ def parse_bytes(
 
 def parse_string(
     request: Request,
-    name: Union[bytes, str],
+    name: str,
     default: Optional[str] = None,
     required: bool = False,
     allowed_values: Optional[Iterable[str]] = None,
@@ -226,7 +226,7 @@ def _parse_string_value(
 @overload
 def parse_strings_from_args(
     args: Dict[bytes, List[bytes]],
-    name: Union[bytes, str],
+    name: str,
     default: Optional[List[str]] = None,
     required: bool = False,
     allowed_values: Optional[Iterable[str]] = None,
@@ -237,7 +237,7 @@ def parse_strings_from_args(
 
 def parse_strings_from_args(
     args: Dict[bytes, List[bytes]],
-    name: Union[bytes, str],
+    name: str,
     default: Optional[List[str]] = None,
     required: bool = False,
     allowed_values: Optional[Iterable[str]] = None,
@@ -267,12 +267,10 @@ def parse_strings_from_args(
             parameter is present, must be one of a list of allowed values and
             is not one of those allowed values.
     """
+    name_bytes = name.encode("ascii")
 
-    if not isinstance(name, bytes):
-        name = name.encode("ascii")
-
-    if name in args:
-        values = args[name]
+    if name_bytes in args:
+        values = args[name_bytes]
 
         return [
             _parse_string_value(value, allowed_values, name=name, encoding=encoding)
@@ -292,7 +290,7 @@ def parse_strings_from_args(
 
 def parse_string_from_args(
     args: Dict[bytes, List[bytes]],
-    name: Union[bytes, str],
+    name: str,
     default: Optional[str] = None,
     required: bool = False,
     allowed_values: Optional[Iterable[str]] = None,

synapse/rest/admin/rooms.py

@@ -649,7 +649,7 @@ async def on_GET(
         limit = parse_integer(request, "limit", default=10)
 
         # picking the API shape for symmetry with /messages
-        filter_str = parse_string(request, b"filter", encoding="utf-8")
+        filter_str = parse_string(request, "filter", encoding="utf-8")
         if filter_str:
             filter_json = urlparse.unquote(filter_str)
             event_filter = Filter(

synapse/rest/client/v1/room.py

@@ -537,7 +537,7 @@ async def on_GET(self, request, room_id):
             self.store, request, default_limit=10
         )
         as_client_event = b"raw" not in request.args
-        filter_str = parse_string(request, b"filter", encoding="utf-8")
+        filter_str = parse_string(request, "filter", encoding="utf-8")
         if filter_str:
             filter_json = urlparse.unquote(filter_str)
             event_filter = Filter(
@@ -652,7 +652,7 @@ async def on_GET(self, request, room_id, event_id):
         limit = parse_integer(request, "limit", default=10)
 
         # picking the API shape for symmetry with /messages
-        filter_str = parse_string(request, b"filter", encoding="utf-8")
+        filter_str = parse_string(request, "filter", encoding="utf-8")
         if filter_str:
             filter_json = urlparse.unquote(filter_str)
             event_filter = Filter(