paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

zproject: Remove u prefix from strings.

Browse Source
This commit is contained in:
rht
2017-11-02 08:05:56 +01:00
committed by showell
parent be2a720a04
commit 38acddee99
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
zproject/backends.py
View File

@@ -50,11 +50,11 @@ def auth_enabled_helper(backends_to_check, realm):
def ldap_auth_enabled(realm=None): def ldap_auth_enabled(realm=None):
# type: (Optional[Realm]) -> bool # type: (Optional[Realm]) -> bool
return auth_enabled_helper([u'LDAP'], realm) return auth_enabled_helper(['LDAP'], realm)
def email_auth_enabled(realm=None): def email_auth_enabled(realm=None):
# type: (Optional[Realm]) -> bool # type: (Optional[Realm]) -> bool
return auth_enabled_helper([u'Email'], realm) return auth_enabled_helper(['Email'], realm)
def password_auth_enabled(realm=None): def password_auth_enabled(realm=None):
# type: (Optional[Realm]) -> bool # type: (Optional[Realm]) -> bool
@@ -62,21 +62,21 @@ def password_auth_enabled(realm=None):
def dev_auth_enabled(realm=None): def dev_auth_enabled(realm=None):
# type: (Optional[Realm]) -> bool # type: (Optional[Realm]) -> bool
return auth_enabled_helper([u'Dev'], realm) return auth_enabled_helper(['Dev'], realm)
def google_auth_enabled(realm=None): def google_auth_enabled(realm=None):
# type: (Optional[Realm]) -> bool # type: (Optional[Realm]) -> bool
return auth_enabled_helper([u'Google'], realm) return auth_enabled_helper(['Google'], realm)
def github_auth_enabled(realm=None): def github_auth_enabled(realm=None):
# type: (Optional[Realm]) -> bool # type: (Optional[Realm]) -> bool
return auth_enabled_helper([u'GitHub'], realm) return auth_enabled_helper(['GitHub'], realm)
def any_oauth_backend_enabled(realm=None): def any_oauth_backend_enabled(realm=None):
# type: (Optional[Realm]) -> bool # type: (Optional[Realm]) -> bool
"""Used by the login page process to determine whether to show the """Used by the login page process to determine whether to show the
'OR' for login with Google""" 'OR' for login with Google"""
return auth_enabled_helper([u'GitHub', u'Google'], realm) return auth_enabled_helper(['GitHub', 'Google'], realm)
def require_email_format_usernames(realm=None): def require_email_format_usernames(realm=None):
# type: (Optional[Realm]) -> bool # type: (Optional[Realm]) -> bool
@@ -372,7 +372,7 @@ class ZulipRemoteUserBackend(RemoteUserBackend):
return None return None
if not user_matches_subdomain(realm_subdomain, user_profile): if not user_matches_subdomain(realm_subdomain, user_profile):
return None return None
if not auth_enabled_helper([u"RemoteUser"], user_profile.realm): if not auth_enabled_helper(["RemoteUser"], user_profile.realm):
return None return None
return user_profile return user_profile
@@ -498,7 +498,7 @@ class DevAuthBackend(ZulipAuthMixin):
return user_profile return user_profile
class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2): class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
auth_backend_name = u"GitHub" auth_backend_name = "GitHub"
def get_email_address(self, *args, **kwargs): def get_email_address(self, *args, **kwargs):
# type: (*Any, **Any) -> Optional[Text] # type: (*Any, **Any) -> Optional[Text]
@@ -572,10 +572,10 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
return self.process_do_auth(user_profile, *args, **kwargs) return self.process_do_auth(user_profile, *args, **kwargs)
AUTH_BACKEND_NAME_MAP = { AUTH_BACKEND_NAME_MAP = {
u'Dev': DevAuthBackend, 'Dev': DevAuthBackend,
u'Email': EmailAuthBackend, 'Email': EmailAuthBackend,
u'GitHub': GitHubAuthBackend, 'GitHub': GitHubAuthBackend,
u'Google': GoogleMobileOauth2Backend, 'Google': GoogleMobileOauth2Backend,
u'LDAP': ZulipLDAPAuthBackend, 'LDAP': ZulipLDAPAuthBackend,
u'RemoteUser': ZulipRemoteUserBackend, 'RemoteUser': ZulipRemoteUserBackend,
} # type: Dict[Text, Any] } # type: Dict[Text, Any]