Enable absolute imports.

See PEP 328[1] for details. This feature was introduced in Python 2.5 and
will become mandatory in Python 3.

[1]: http://www.python.org/dev/peps/pep-0328

(imported from commit 7444eeba8a08d5f91b94c7921848f2274979bd76)

zephyr/context_processors.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 
 def add_settings(request):

zephyr/decorator.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
 from django.http import QueryDict

zephyr/filters.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.views.debug import SafeExceptionReporterFilter
 from django.http import build_request_repr
 

zephyr/forms.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django import forms
 from django.core import validators
 from django.core.exceptions import ValidationError

zephyr/handlers.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import sys
 import logging
 import traceback

zephyr/lib/actions.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.contrib.sessions.models import Session
 from zephyr.lib.context_managers import lockfile

zephyr/lib/avatar.py

@@ -1,5 +1,7 @@
+from __future__ import absolute_import
+
 import hashlib
-from utils import make_safe_digest
+from zephyr.lib.utils import make_safe_digest
 
 def gravatar_hash(email):
     """Compute the Gravatar hash for an email address."""

zephyr/lib/bulk_create.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 
 from zephyr.lib.initial_password import initial_password, initial_api_key

zephyr/lib/cache.py

@@ -1,11 +1,11 @@
+from __future__ import absolute_import
+
 from functools import wraps
 
 from django.core.cache import cache as djcache
 from django.core.cache import get_cache
 
-from utils import make_safe_digest
-
-from zephyr.lib.utils import statsd, statsd_key
+from zephyr.lib.utils import statsd, statsd_key, make_safe_digest
 
 def cache_with_key(keyfunc, cache_name=None, timeout=None):
     """Decorator which applies Django caching to a function.

zephyr/lib/cache_helpers.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 # 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

zephyr/lib/context_managers.py

@@ -2,6 +2,8 @@
 Context managers, i.e. things you can use with the 'with' statement.
 """
 
+from __future__ import absolute_import
+
 import fcntl
 from os import path
 from contextlib import contextmanager

zephyr/lib/create_user.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.contrib.auth.models import UserManager
 from django.utils import timezone

zephyr/lib/debug.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import code
 import traceback
 import signal

zephyr/lib/event_queue.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 from collections import deque
 import os

zephyr/lib/initial_password.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 
 import hashlib

zephyr/lib/minify.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 from hashlib     import sha1
 from os          import path

zephyr/lib/parallel.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 import pty
 import sys

zephyr/lib/query.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 def last_n(n, query_set):
     """Get the last n results from a Django QuerySet, in a semi-efficient way.
        Returns a list."""

zephyr/lib/queue.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 import pika
 import logging

zephyr/lib/response.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.http import HttpResponse, HttpResponseNotAllowed
 import simplejson
 

zephyr/lib/stats.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 import os
 import logging

zephyr/lib/timeout.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import time
 import ctypes
 import threading

zephyr/lib/timestamp.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import datetime
 import calendar
 from django.utils.timezone import utc

zephyr/lib/tornado_ioloop_logging.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import logging
 import time
 from tornado import ioloop

zephyr/lib/unminify.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import re
 import bisect
 import simplejson

zephyr/lib/utils.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
+
 import hashlib
 from time import sleep, time
 from django.conf import settings

zephyr/management/commands/activate_mit.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.core.management.base import BaseCommand
 from confirmation.models import Confirmation

zephyr/management/commands/add_users_to_streams.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 
 from django.core.management.base import BaseCommand

zephyr/management/commands/analyze_mit.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.core.management.base import BaseCommand
 from zephyr.models import Realm, UserProfile, Recipient, Message, get_client

zephyr/management/commands/change_user_email.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 
 from zephyr.lib.actions import do_change_user_email

zephyr/management/commands/clear_db.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import NoArgsCommand
 from zephyr.models import clear_database
 

zephyr/management/commands/colorize_streams.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 
 from django.core.management.base import BaseCommand

zephyr/management/commands/copy_colors.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 from zephyr.models import StreamColor, Subscription
 

zephyr/management/commands/create_realm.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 from zephyr.lib.actions import do_create_realm
 

zephyr/management/commands/create_user.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import sys
 from optparse import make_option
 

zephyr/management/commands/deactivate_user.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 
 from django.core.management.base import BaseCommand

zephyr/management/commands/delete_tutorial_streams.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 from zephyr.models import Subscription, Recipient, Message, Stream, \
     get_user_profile_by_email

zephyr/management/commands/dump_passwords.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.core.management.base import BaseCommand
 from zephyr.models import UserProfile, get_user_profile_by_email

zephyr/management/commands/dump_pointers.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.core.management.base import BaseCommand
 from zephyr.models import Realm, UserProfile, Message, UserMessage, \

zephyr/management/commands/dump_useractivity.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.core.management.base import BaseCommand
 from zephyr.models import Realm, UserActivity, get_client, \

zephyr/management/commands/explain_js_error.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 import sys
 import select

zephyr/management/commands/expunge_db.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 from zephyr.retention_policy     import get_UserMessages_to_expunge
 from zephyr.models               import Message

zephyr/management/commands/expunge_logs.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 import sys
 import datetime

zephyr/management/commands/fill_memcached_caches.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.core.management.base import BaseCommand
 from zephyr.lib.cache_helpers import fill_memcached_cache, cache_fillers

zephyr/management/commands/generate_invite_links.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.contrib.sites.models import Site
 from django.core.management.base import BaseCommand

zephyr/management/commands/logout_all_users.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 
 from django.core.management.base import BaseCommand

zephyr/management/commands/populate_db.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 from django.utils.timezone import utc, now
 

zephyr/management/commands/print_initial_password.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 from zephyr.lib.initial_password import initial_password, initial_api_key
 

zephyr/management/commands/process_user_activity.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.core.management.base import BaseCommand
 import simplejson

zephyr/management/commands/realm_stats.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import datetime
 import pytz
 

zephyr/management/commands/remove_users_from_stream.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 
 from django.core.management.base import BaseCommand

zephyr/management/commands/reset_colors.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 from zephyr.models import Subscription, Recipient, get_user_profile_by_email
 

zephyr/management/commands/runtornado.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 settings.RUNNING_INSIDE_TORNADO = True
 # We must call zephyr.lib.tornado_ioloop_logging.instrument_tornado_ioloop

zephyr/management/commands/send_confirmation_emails.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 
 from zephyr.models import get_user_profile_by_email, get_prereg_user_by_email

zephyr/management/commands/send_stats.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.core.management.base import BaseCommand
 from django.conf import settings
 

zephyr/management/commands/set_message_flags.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 import logging
 import sys

zephyr/management/commands/set_unread_to_pointer.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 import logging
 

zephyr/management/commands/subscribe_new_users.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import simplejson
 from postmonkey import PostMonkey
 from django.core.management.base import BaseCommand

zephyr/management/commands/update_mit_fullnames.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from optparse import make_option
 from django.core.management.base import BaseCommand
 

zephyr/management/commands/user_stats.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import datetime
 import pytz
 

zephyr/middleware.py

@@ -1,5 +1,7 @@
+from __future__ import absolute_import
+
 from django.conf import settings
-from decorator import RequestVariableMissingError, RequestVariableConversionError
+from zephyr.decorator import RequestVariableMissingError, RequestVariableConversionError
 from zephyr.lib.response import json_error
 from django.db import connection
 from zephyr.lib.utils import statsd

zephyr/models.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.db import models
 from django.conf import settings
 from django.contrib.auth.models import AbstractBaseUser, UserManager

zephyr/openid.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 # Defer importing until later to avoid circular imports
 
 def openid_failure_handler(request, message, status=403, template_name=None, exception=None):

zephyr/retention_policy.py

@@ -9,6 +9,7 @@ rather than iterating through messages one by one.
 The code in this module does not actually remove anything; it just identifies
 which items should be kept or removed.
 """
+from __future__ import absolute_import
 
 import operator
 

zephyr/tests.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
 
 from django.test import TestCase
 from django.test.simple import DjangoTestSuiteRunner

zephyr/tornado_callbacks.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 from zephyr.models import Message, UserProfile, UserMessage, \
     Recipient, Stream, get_stream

zephyr/tornadoviews.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 from zephyr.models import UserActivity
 

zephyr/views.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.contrib.auth import authenticate, login
 from django.contrib.auth.decorators import login_required