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

zerver/lib: remove import six.

Browse Source
This commit is contained in:
rht
2017-09-27 10:06:17 +02:00
committed by Tim Abbott
parent 43fd0e8134
commit 035ed93111
17 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/actions.py
View File

@@ -72,7 +72,6 @@ from django.core.mail import EmailMessage
from django.utils.timezone import now as timezone_now
from confirmation.models import Confirmation, create_confirmation_link
import six
from six.moves import filter
from six.moves import map
from six.moves import range
@@ -1267,7 +1266,7 @@ def check_typing_notification(sender, notification_to, operator):
recipient = recipient_for_emails(notification_to, False,
sender, sender)
except ValidationError as e:
assert isinstance(e.messages[0], six.string_types)
assert isinstance(e.messages[0], str)
raise JsonableError(e.messages[0])
if recipient.type == Recipient.STREAM:
raise ValueError('Forbidden recipient type')
@@ -1438,7 +1437,7 @@ def extract_recipients(s):
except ValueError:
data = s
if isinstance(data, six.string_types):
if isinstance(data, str):
data = data.split(',')
if not isinstance(data, list):
@@ -1608,7 +1607,7 @@ def check_message(sender, client, addressee,
recipient = recipient_for_user_profiles(user_profiles, not_forged_mirror_message,
forwarder_user_profile, sender)
except ValidationError as e:
assert isinstance(e.messages[0], six.string_types)
assert isinstance(e.messages[0], str)
raise JsonableError(e.messages[0])
else:
raise JsonableError(_("Invalid message type"))