From 28ee511b7e58edb6c0e4fcf3412dd40c6f60eb33 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 17 Jul 2015 08:19:40 -0400 Subject: Fixed db.utils.load_backend() on non-ASCII paths. --- django/db/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django') 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 = [] -- cgit v1.3