Fixup synapse.api to pass mypy (#6733)

This commit is contained in:
Erik Johnston 2020-01-20 17:34:13 +00:00 committed by GitHub
parent ceecedc68b
commit 0f6e525be3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 4 deletions

1
changelog.d/6733.misc Normal file
View file

@ -0,0 +1 @@
Fixup synapse.api to pass mypy.

View file

@ -7,6 +7,9 @@ show_error_codes = True
show_traceback = True show_traceback = True
mypy_path = stubs mypy_path = stubs
[mypy-pymacaroons.*]
ignore_missing_imports = True
[mypy-zope] [mypy-zope]
ignore_missing_imports = True ignore_missing_imports = True

View file

@ -15,6 +15,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from typing import List
from six import text_type from six import text_type
import jsonschema import jsonschema
@ -293,7 +295,7 @@ class Filter(object):
room_id = None room_id = None
ev_type = "m.presence" ev_type = "m.presence"
contains_url = False contains_url = False
labels = [] labels = [] # type: List[str]
else: else:
sender = event.get("sender", None) sender = event.get("sender", None)
if not sender: if not sender:

View file

@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import collections from collections import OrderedDict
from typing import Any, Optional, Tuple
from synapse.api.errors import LimitExceededError from synapse.api.errors import LimitExceededError
@ -23,7 +24,9 @@ class Ratelimiter(object):
""" """
def __init__(self): def __init__(self):
self.message_counts = collections.OrderedDict() self.message_counts = (
OrderedDict()
) # type: OrderedDict[Any, Tuple[float, int, Optional[float]]]
def can_do_action(self, key, time_now_s, rate_hz, burst_count, update=True): def can_do_action(self, key, time_now_s, rate_hz, burst_count, update=True):
"""Can the entity (e.g. user or IP address) perform the action? """Can the entity (e.g. user or IP address) perform the action?

View file

@ -634,7 +634,7 @@ def get_public_keys(invite_event):
return public_keys return public_keys
def auth_types_for_event(event) -> Set[Tuple[str]]: def auth_types_for_event(event) -> Set[Tuple[str, str]]:
"""Given an event, return a list of (EventType, StateKey) that may be """Given an event, return a list of (EventType, StateKey) that may be
needed to auth the event. The returned list may be a superset of what needed to auth the event. The returned list may be a superset of what
would actually be required depending on the full state of the room. would actually be required depending on the full state of the room.

View file

@ -177,6 +177,7 @@ env =
MYPYPATH = stubs/ MYPYPATH = stubs/
extras = all extras = all
commands = mypy \ commands = mypy \
synapse/api \
synapse/config/ \ synapse/config/ \
synapse/handlers/ui_auth \ synapse/handlers/ui_auth \
synapse/logging/ \ synapse/logging/ \