diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2019-11-07 01:26:22 -0800 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.es> | 2019-11-07 10:26:22 +0100 |
| commit | 77aa74cb70dd85497dbade6bc0f394aa41e88c94 (patch) | |
| tree | f526b5e63897415e8753c6e38396bba535e3fc75 /django | |
| parent | 367634f976ab43db93321bf4eb898449b670e291 (diff) | |
Refs #29983 -- Added support for using pathlib.Path in all settings.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/staticfiles/management/commands/findstatic.py | 2 | ||||
| -rw-r--r-- | django/db/backends/sqlite3/base.py | 4 | ||||
| -rw-r--r-- | django/db/backends/sqlite3/creation.py | 5 | ||||
| -rw-r--r-- | django/forms/renderers.py | 2 | ||||
| -rw-r--r-- | django/template/utils.py | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/django/contrib/staticfiles/management/commands/findstatic.py b/django/contrib/staticfiles/management/commands/findstatic.py index cd58015788..fe3b53cbd8 100644 --- a/django/contrib/staticfiles/management/commands/findstatic.py +++ b/django/contrib/staticfiles/management/commands/findstatic.py @@ -21,7 +21,7 @@ class Command(LabelCommand): if verbosity >= 2: searched_locations = ( "\nLooking in the following locations:\n %s" % - "\n ".join(finders.searched_locations) + "\n ".join([str(loc) for loc in finders.searched_locations]) ) else: searched_locations = '' diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index 45a22f5a36..51a15ee10a 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -174,7 +174,9 @@ class DatabaseWrapper(BaseDatabaseWrapper): "settings.DATABASES is improperly configured. " "Please supply the NAME value.") kwargs = { - 'database': settings_dict['NAME'], + # TODO: Remove str() when dropping support for PY36. + # https://bugs.python.org/issue33496 + 'database': str(settings_dict['NAME']), 'detect_types': Database.PARSE_DECLTYPES | Database.PARSE_COLNAMES, **settings_dict['OPTIONS'], } diff --git a/django/db/backends/sqlite3/creation.py b/django/db/backends/sqlite3/creation.py index 3fcf668ced..d97052f52d 100644 --- a/django/db/backends/sqlite3/creation.py +++ b/django/db/backends/sqlite3/creation.py @@ -1,6 +1,7 @@ import os import shutil import sys +from pathlib import Path from django.db.backends.base.creation import BaseDatabaseCreation @@ -9,7 +10,9 @@ class DatabaseCreation(BaseDatabaseCreation): @staticmethod def is_in_memory_db(database_name): - return database_name == ':memory:' or 'mode=memory' in database_name + return not isinstance(database_name, Path) and ( + database_name == ':memory:' or 'mode=memory' in database_name + ) def _get_test_db_name(self): test_database_name = self.connection.settings_dict['TEST']['NAME'] or ':memory:' diff --git a/django/forms/renderers.py b/django/forms/renderers.py index 9fb695bdb2..19fab493cf 100644 --- a/django/forms/renderers.py +++ b/django/forms/renderers.py @@ -39,7 +39,7 @@ class EngineMixin: def engine(self): return self.backend({ 'APP_DIRS': True, - 'DIRS': [str(ROOT / self.backend.app_dirname)], + 'DIRS': [ROOT / self.backend.app_dirname], 'NAME': 'djangoforms', 'OPTIONS': {}, }) diff --git a/django/template/utils.py b/django/template/utils.py index f4ed2750c2..2d30e1637a 100644 --- a/django/template/utils.py +++ b/django/template/utils.py @@ -99,7 +99,7 @@ def get_app_template_dirs(dirname): installed applications. """ template_dirs = [ - str(Path(app_config.path) / dirname) + Path(app_config.path) / dirname for app_config in apps.get_app_configs() if app_config.path and (Path(app_config.path) / dirname).is_dir() ] |
