Merge remote-tracking branch 'origin/pr/392' into 392
This commit is contained in:
commit
bc008c2597
@ -1,7 +1,10 @@
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.sessions.backends.base import SessionBase, CreateError
|
from django.contrib.sessions.backends.base import SessionBase, CreateError
|
||||||
from django.core.exceptions import SuspiciousOperation
|
from django.core.exceptions import SuspiciousOperation
|
||||||
from django.utils.encoding import force_unicode
|
try:
|
||||||
|
from django.utils.encoding import force_unicode
|
||||||
|
except ImportError:
|
||||||
|
from django.utils.encoding import force_text as force_unicode
|
||||||
|
|
||||||
from mongoengine.document import Document
|
from mongoengine.document import Document
|
||||||
from mongoengine import fields
|
from mongoengine import fields
|
||||||
|
Loading…
x
Reference in New Issue
Block a user