From 6c3ae7cb4e1ddcf6a4274ae7f0439df46336d5b6 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 24 Feb 2018 16:38:17 +0100
Subject: [PATCH] fix mypy

---
 openslides/utils/autoupdate.py | 10 +++++-----
 openslides/utils/views.py      |  4 ++--
 setup.cfg                      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/openslides/utils/autoupdate.py b/openslides/utils/autoupdate.py
index 8926e9400..b433adaa6 100644
--- a/openslides/utils/autoupdate.py
+++ b/openslides/utils/autoupdate.py
@@ -3,7 +3,7 @@ import threading
 import time
 import warnings
 from collections import OrderedDict, defaultdict
-from typing import Any, Dict, Generator, Iterable, List, Tuple, Union
+from typing import Any, Dict, Generator, Iterable, List, Tuple, Union, Optional
 
 from channels import Channel, Group
 from channels.asgi import get_channel_layer
@@ -317,12 +317,12 @@ def send_data_site(message: ChannelMessageFormat) -> None:
             send_or_wait(Channel(channel_name).send, {'text': json.dumps(output)})
 
 
-def to_ordered_dict(d):
+def to_ordered_dict(d: Optional[Dict]) -> Optional[OrderedDict]:
     """
     Little helper to hash information dict in inform_*_data.
     """
     if isinstance(d, dict):
-        result = OrderedDict([(key, to_ordered_dict(d[key])) for key in sorted(d.keys())])
+        result = OrderedDict([(key, to_ordered_dict(d[key])) for key in sorted(d.keys())])  # type: Optional[OrderedDict]
     else:
         result = d
     return result
@@ -404,11 +404,11 @@ class AutoupdateBundleMiddleware:
     """
     Middleware to handle autoupdate bundling.
     """
-    def __init__(self, get_response):
+    def __init__(self, get_response: Any) -> None:
         self.get_response = get_response
         # One-time configuration and initialization.
 
-    def __call__(self, request):
+    def __call__(self, request: Any) -> Any:
         thread_id = threading.get_ident()
         autoupdate_bundle[thread_id] = {}
 
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 6da9b231b..016748b20 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -82,6 +82,6 @@ class BinaryTemplateView(TemplateView):
     """
     Loads the specified binary template and encode it with base64.
     """
-    def load_template(self):
+    def load_template(self) -> str:
         with open(finders.find(self.template_name), 'rb') as template:
-            return base64.b64encode(template.read())
+            return base64.b64encode(template.read()).decode()
diff --git a/setup.cfg b/setup.cfg
index a07430750..86bcf93e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,10 +20,10 @@ strict_optional = true
 check_untyped_defs = true
 
 [mypy-openslides.utils.*]
-disallow_any = unannotated
+disallow_untyped_defs = true
 
 [mypy-openslides.core.config]
-disallow_any = unannotated
+disallow_untyped_defs = true
 
 [mypy-tests.*]
 ignore_errors = true