Merge remote-tracking branch 'origin/versions/micro' into versions/minor
Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
@@ -8,7 +8,12 @@ import tempfile
|
||||
from pathlib2 import Path
|
||||
|
||||
from django.utils.module_loading import import_string
|
||||
from django.utils.six import PY3
|
||||
try:
|
||||
from django.utils.six import PY3
|
||||
except ImportError:
|
||||
# This is being imported outside of Django
|
||||
import sys
|
||||
PY3 = sys.version_info[0] == 3
|
||||
|
||||
from .settings import setting_temporary_directory
|
||||
|
||||
|
||||
Reference in New Issue
Block a user