diff options
| author | Tim Graham <timograham@gmail.com> | 2017-01-20 08:01:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-20 08:01:02 -0500 |
| commit | 4e729feaa647547f25debb1cb63dec989dc41a20 (patch) | |
| tree | 7c7a38c5961bf4daf98a8cb47dc74c769563ffcf /django/db/utils.py | |
| parent | ec4c1d6717da7a9d09d5b3ce84cccac819bb592c (diff) | |
Refs #23919 -- Removed django.utils._os.upath()/npath()/abspathu() usage.
These functions do nothing on Python 3.
Diffstat (limited to 'django/db/utils.py')
| -rw-r--r-- | django/db/utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/django/db/utils.py b/django/db/utils.py index 8ca3f860b3..a35de01ffa 100644 --- a/django/db/utils.py +++ b/django/db/utils.py @@ -6,7 +6,6 @@ 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 npath, upath from django.utils.functional import cached_property from django.utils.module_loading import import_string @@ -116,10 +115,10 @@ def load_backend(backend_name): except ImportError as e_user: # The database backend wasn't found. Display a helpful error message # listing all possible (built-in) database backends. - backend_dir = os.path.join(os.path.dirname(upath(__file__)), 'backends') + backend_dir = os.path.join(os.path.dirname(__file__), 'backends') try: builtin_backends = [ - name for _, name, ispkg in pkgutil.iter_modules([npath(backend_dir)]) + name for _, name, ispkg in pkgutil.iter_modules([backend_dir]) if ispkg and name not in {'base', 'dummy', 'postgresql_psycopg2'} ] except EnvironmentError: |
