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

utils: Cast generate_random_token to str.

Browse Source 
Having this be Text is forcing various URLs, emails, etc to be type
annotated as Text.
This commit is contained in:
Rishi Gupta
2017-07-07 17:46:51 -07:00
committed by Tim Abbott
parent a610cec8fc
commit 3bc74113ad
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
confirmation/models.py
View File

@@ -22,7 +22,7 @@ from typing import Any, Dict, Optional, Text, Union
B16_RE = re.compile('^[a-f0-9]{40}$')
def generate_key():
# type: () -> Text
# type: () -> str
return generate_random_token(40)
class ConfirmationManager(models.Manager):
@@ -47,17 +47,17 @@ class ConfirmationManager(models.Manager):
return False
def get_link_for_object(self, obj, host):
# type: (Union[ContentType, int], str) -> Text
# type: (Union[ContentType, int], str) -> str
key = generate_key()
self.create(content_object=obj, date_sent=timezone_now(), confirmation_key=key)
return self.get_activation_url(key, host)
def get_activation_url(self, confirmation_key, host):
# type: (Text, str) -> Text
return u'%s%s%s' % (settings.EXTERNAL_URI_SCHEME,
host,
reverse(self.url_pattern_name,
kwargs={'confirmation_key': confirmation_key}))
# type: (str, str) -> str
return '%s%s%s' % (settings.EXTERNAL_URI_SCHEME,
host,
reverse(self.url_pattern_name,
kwargs={'confirmation_key': confirmation_key}))
class EmailChangeConfirmationManager(ConfirmationManager):
url_pattern_name = 'zerver.views.user_settings.confirm_email_change'