From a8d6bd3322e3e09df284a0be2374fe9fd41ab024 Mon Sep 17 00:00:00 2001 From: Jessica McKellar Date: Mon, 11 Mar 2013 11:19:42 -0400 Subject: [PATCH] Remove some unused imports. (imported from commit bb8311848ca24fbb1fb1b3df8f8b4403eb38ce1c) --- zephyr/lib/actions.py | 3 +-- zephyr/views.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/zephyr/lib/actions.py b/zephyr/lib/actions.py index 5c5e7eca7c..b4fba419ee 100644 --- a/zephyr/lib/actions.py +++ b/zephyr/lib/actions.py @@ -4,10 +4,9 @@ from zephyr.lib.context_managers import lockfile from zephyr.models import Realm, Stream, UserProfile, UserActivity, \ Subscription, Recipient, Message, UserMessage, \ DefaultStream, StreamColor, UserPresence, \ - MAX_MESSAGE_LENGTH, get_client, get_display_recipient, get_stream + MAX_MESSAGE_LENGTH, get_client, get_stream from django.db import transaction, IntegrityError from zephyr.lib.initial_password import initial_password -from zephyr.lib.cache import cache_with_key from zephyr.lib.timestamp import timestamp_to_datetime, datetime_to_timestamp from zephyr.lib.message_cache import cache_save_message from zephyr.lib.queue import SimpleQueueClient diff --git a/zephyr/views.py b/zephyr/views.py index 8939c2df9f..02728a5fef 100644 --- a/zephyr/views.py +++ b/zephyr/views.py @@ -14,7 +14,7 @@ from django.db.models import Q from django.core.mail import send_mail from zephyr.models import Message, UserProfile, Stream, Subscription, \ Recipient, get_huddle, Realm, UserMessage, \ - StreamColor, PreregistrationUser, get_client, MitUser, User, UserActivity, \ + PreregistrationUser, get_client, MitUser, User, UserActivity, \ MAX_SUBJECT_LENGTH, MAX_MESSAGE_LENGTH, get_stream, UserPresence from zephyr.lib.actions import do_add_subscription, do_remove_subscription, \ do_change_password, create_mit_user_if_needed, do_change_full_name, \