Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mypy: Add Optional & check in zproject/backends.py; remove from mypy.ini.

This commit is contained in:
neiljp (Neil Pilgrim) 2018-10-27 01:19:49 +00:00 committed by Tim Abbott
parent 482383b6f7
commit c3cd3e94c1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mypy.ini
View File

@ -163,8 +163,6 @@ strict_optional = False
strict_optional = False
[mypy-zerver.lib.actions]
strict_optional = False
[mypy-zproject.backends]
strict_optional = False
[mypy-zerver.worker.queue_processors]
strict_optional = False
[mypy-zerver.tornado.websocket_client]

9
zproject/backends.py
View File

@ -81,7 +81,7 @@ def require_email_format_usernames(realm: Optional[Realm]=None) -> bool:
return True
def common_get_active_user(email: str, realm: Realm,
return_data: Dict[str, Any]=None) -> Optional[UserProfile]:
return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
try:
user_profile = get_user(email, realm)
except UserProfile.DoesNotExist:
@ -159,7 +159,7 @@ class ZulipDummyBackend(ZulipAuthMixin):
def authenticate(self, username: Optional[str]=None, realm: Optional[Realm]=None,
use_dummy_backend: bool=False,
return_data: Dict[str, Any]=None) -> Optional[UserProfile]:
return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
if use_dummy_backend:
# These are kwargs only for readability; they should never be None
assert username is not None
@ -215,7 +215,7 @@ class GoogleMobileOauth2Backend(ZulipAuthMixin):
https://developers.google.com/accounts/docs/CrossClientAuth#offlineAccess
"""
def authenticate(self, google_oauth2_token: str=None, realm: Optional[Realm]=None,
def authenticate(self, google_oauth2_token: Optional[str]=None, realm: Optional[Realm]=None,
return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
# We lazily import apiclient as part of optimizing the base
# import time for a Zulip management command, since it's only
@ -346,7 +346,8 @@ class ZulipLDAPAuthBackend(ZulipLDAPAuthBackendBase):
try:
username = self.django_to_ldap_username(username)
except ZulipLDAPExceptionOutsideDomain:
return_data['outside_ldap_domain'] = True
if return_data is not None:
return_data['outside_ldap_domain'] = True
return None
return ZulipLDAPAuthBackendBase.authenticate(self,