Fix Django.utils.importlib deprecation warnings.

This changes `from django.utils.importlib import import_module` to
`from importlib import import_module`, as `django.utils.importlib` will
be removed in django version 1.9.
This commit is contained in:
Mohsen Ibrahim
2016-10-17 13:02:45 +03:00
committed by Tim Abbott
parent e9899e4dc9
commit bfe5787197
3 changed files with 5 additions and 5 deletions

View File

@@ -44,7 +44,7 @@ from django.db import transaction, IntegrityError
from django.db.models import F, Q from django.db.models import F, Q
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.utils.importlib import import_module from importlib import import_module
from django.core.mail import EmailMessage from django.core.mail import EmailMessage
from django.utils.timezone import now from django.utils.timezone import now
@@ -339,7 +339,7 @@ def user_sessions(user_profile):
def delete_session(session): def delete_session(session):
# type: (Session) -> None # type: (Session) -> None
session_engine.SessionStore(session.session_key).delete() session_engine.SessionStore(session.session_key).delete() # type: ignore # import_module
def delete_user_sessions(user_profile): def delete_user_sessions(user_profile):
# type: (UserProfile) -> None # type: (UserProfile) -> None

View File

@@ -14,7 +14,7 @@ from zerver.lib.cache import cache_with_key, cache_set, \
user_profile_by_email_cache_key, user_profile_by_id_cache_key, \ user_profile_by_email_cache_key, user_profile_by_id_cache_key, \
get_remote_cache_time, get_remote_cache_requests, cache_set_many, \ get_remote_cache_time, get_remote_cache_requests, cache_set_many, \
to_dict_cache_key_id to_dict_cache_key_id
from django.utils.importlib import import_module from importlib import import_module
from django.contrib.sessions.models import Session from django.contrib.sessions.models import Session
import logging import logging
from django.db.models import Q from django.db.models import Q
@@ -58,7 +58,7 @@ def recipient_cache_items(items_for_remote_cache, recipient):
session_engine = import_module(settings.SESSION_ENGINE) session_engine = import_module(settings.SESSION_ENGINE)
def session_cache_items(items_for_remote_cache, session): def session_cache_items(items_for_remote_cache, session):
# type: (Dict[text_type, text_type], Session) -> None # type: (Dict[text_type, text_type], Session) -> None
store = session_engine.SessionStore(session_key=session.session_key) store = session_engine.SessionStore(session_key=session.session_key) # type: ignore # import_module
items_for_remote_cache[store.cache_key] = store.decode(session.session_data) items_for_remote_cache[store.cache_key] = store.decode(session.session_data)
# Format is (objects query, items filler function, timeout, batch size) # Format is (objects query, items filler function, timeout, batch size)

View File

@@ -4,7 +4,7 @@ from six import text_type
from typing import Any, Union, Mapping, Optional from typing import Any, Union, Mapping, Optional
from django.conf import settings from django.conf import settings
from django.utils.importlib import import_module from importlib import import_module
from django.utils import timezone from django.utils import timezone
from django.contrib.sessions.models import Session as djSession from django.contrib.sessions.models import Session as djSession