paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 12:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

mypy: Use Optional with strings where required.

Browse Source
This commit is contained in:
Eklavya Sharma
2017-05-23 14:04:54 -07:00
committed by Tim Abbott
parent 481d14df39
commit cc1937c8d5
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/lib/test_script.py
View File

@@ -1,7 +1,7 @@
from __future__ import absolute_import from __future__ import absolute_import
from __future__ import print_function from __future__ import print_function
from typing import Tuple from typing import Optional, Tuple
import os import os
from distutils.version import LooseVersion from distutils.version import LooseVersion
@@ -46,7 +46,7 @@ Do this: `./tools/provision`
''' '''
def get_provisioning_status(): def get_provisioning_status():
# type: () -> Tuple[bool, str] # type: () -> Tuple[bool, Optional[str]]
version_file = get_version_file() version_file = get_version_file()
if not os.path.exists(version_file): if not os.path.exists(version_file):

2
zerver/lib/utils.py
View File

@@ -207,7 +207,7 @@ def is_subdomain_root_or_alias(request):
return not subdomain or subdomain in settings.ROOT_SUBDOMAIN_ALIASES return not subdomain or subdomain in settings.ROOT_SUBDOMAIN_ALIASES
def check_subdomain(realm_subdomain, user_subdomain): def check_subdomain(realm_subdomain, user_subdomain):
# type: (Text, Text) -> bool # type: (Optional[Text], Optional[Text]) -> bool
if settings.REALMS_HAVE_SUBDOMAINS and realm_subdomain is not None: if settings.REALMS_HAVE_SUBDOMAINS and realm_subdomain is not None:
if (realm_subdomain == "" and user_subdomain is None): if (realm_subdomain == "" and user_subdomain is None):
return True return True

4
zproject/local_settings.py
View File

@@ -9,7 +9,7 @@
import platform import platform
import six.moves.configparser import six.moves.configparser
from base64 import b64decode from base64 import b64decode
from typing import Set from typing import Optional, Set
config_file = six.moves.configparser.RawConfigParser() # type: ignore # https://github.com/python/typeshed/pull/206 config_file = six.moves.configparser.RawConfigParser() # type: ignore # https://github.com/python/typeshed/pull/206
config_file.read("/etc/zulip/zulip.conf") config_file.read("/etc/zulip/zulip.conf")
@@ -99,7 +99,7 @@ EMAIL_GATEWAY_EXTRA_PATTERN_HACK = r'@[\w-]*\.zulip\.net'
EMAIL_GATEWAY_BOT = "emailgateway@zulip.com" EMAIL_GATEWAY_BOT = "emailgateway@zulip.com"
SSO_APPEND_DOMAIN = None # type: str SSO_APPEND_DOMAIN = None # type: Optional[str]
AUTHENTICATION_BACKENDS = ('zproject.backends.EmailAuthBackend', AUTHENTICATION_BACKENDS = ('zproject.backends.EmailAuthBackend',
'zproject.backends.GoogleMobileOauth2Backend') 'zproject.backends.GoogleMobileOauth2Backend')

6
zproject/prod_settings_template.py
View File

@@ -1,3 +1,5 @@
from typing import Optional
# Zulip Settings intended to be set by a system administrator. # Zulip Settings intended to be set by a system administrator.
# #
# See http://zulip.readthedocs.io/en/latest/settings.html for # See http://zulip.readthedocs.io/en/latest/settings.html for
@@ -128,7 +130,7 @@ AUTHENTICATION_BACKENDS = (
# set this to your domain (e.g. if REMOTE_USER is "username" and the # set this to your domain (e.g. if REMOTE_USER is "username" and the
# corresponding email address is "username@example.com", set # corresponding email address is "username@example.com", set
# SSO_APPEND_DOMAIN = "example.com") # SSO_APPEND_DOMAIN = "example.com")
SSO_APPEND_DOMAIN = None # type: str SSO_APPEND_DOMAIN = None # type: Optional[str]
### OPTIONAL SETTINGS ### OPTIONAL SETTINGS
@@ -358,7 +360,7 @@ AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=users,dc=example,dc=com",
# If the value of a user's "uid" (or similar) property is not their email # If the value of a user's "uid" (or similar) property is not their email
# address, specify the domain to append here. # address, specify the domain to append here.
LDAP_APPEND_DOMAIN = None # type: str LDAP_APPEND_DOMAIN = None # type: Optional[str]
# This map defines how to populate attributes of a Zulip user from LDAP. # This map defines how to populate attributes of a Zulip user from LDAP.
AUTH_LDAP_USER_ATTR_MAP = { AUTH_LDAP_USER_ATTR_MAP = {