summaryrefslogtreecommitdiff
path: root/django/db/utils.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-07-17 08:19:40 -0400
committerTim Graham <timograham@gmail.com>2015-07-17 08:21:43 -0400
commit28ee511b7e58edb6c0e4fcf3412dd40c6f60eb33 (patch)
tree92d3ab0042aef03421da628e6dd9e50fb320d69e /django/db/utils.py
parent2f6bdab1597ee42b36752bf9f624d3386e951379 (diff)
Fixed db.utils.load_backend() on non-ASCII paths.
Diffstat (limited to 'django/db/utils.py')
-rw-r--r--django/db/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/utils.py b/django/db/utils.py
index 20314495e4..64d44a715b 100644
--- a/django/db/utils.py
+++ b/django/db/utils.py
@@ -8,7 +8,7 @@ from threading import local
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.utils import six
-from django.utils._os import upath
+from django.utils._os import npath, upath
from django.utils.deprecation import RemovedInDjango110Warning
from django.utils.functional import cached_property
from django.utils.module_loading import import_string
@@ -113,7 +113,7 @@ def load_backend(backend_name):
backend_dir = os.path.join(os.path.dirname(upath(__file__)), 'backends')
try:
builtin_backends = [
- name for _, name, ispkg in pkgutil.iter_modules([backend_dir])
+ name for _, name, ispkg in pkgutil.iter_modules([npath(backend_dir)])
if ispkg and name not in {'base', 'dummy'}]
except EnvironmentError:
builtin_backends = []