Rename lib/message_cache.py to lib/cache_helpers.py

(imported from commit 591e427aee47aea58b50d6c3fbd6a05cfe9378ea)

zephyr/lib/actions.py

@@ -9,7 +9,7 @@ from django.db import transaction, IntegrityError
 from django.db.models import F
 from zephyr.lib.initial_password import initial_password
 from zephyr.lib.timestamp import timestamp_to_datetime, datetime_to_timestamp
-from zephyr.lib.message_cache import cache_save_message
+from zephyr.lib.cache_helpers import cache_save_message
 from zephyr.lib.queue import SimpleQueueClient
 from django.utils import timezone
 from zephyr.lib.create_user import create_user

zephyr/lib/cache_helpers.py

@@ -1,3 +1,6 @@
+# This file needs to be different from cache.py because cache.py
+# cannot import anything from zephyr.models or we'd have an import
+# loop
 from zephyr.models import Message
 from zephyr.lib.cache import cache_with_key, djcache, message_cache_key
 

zephyr/management/commands/fill_memcached_caches.py

@@ -1,6 +1,6 @@
 from optparse import make_option
 from django.core.management.base import BaseCommand
-from zephyr.lib.message_cache import populate_message_cache
+from zephyr.lib.cache_helpers import populate_message_cache
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list

zephyr/tornadoviews.py

@@ -19,7 +19,7 @@ import logging
 import subprocess
 from django.core.cache import cache
 from zephyr.lib.cache import cache_with_key
-from zephyr.lib.message_cache import cache_save_message, cache_get_message
+from zephyr.lib.cache_helpers import cache_save_message, cache_get_message
 
 SERVER_GENERATION = int(time.time())