Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions django/utils/deprecation.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@

@functools.cache
def django_file_prefixes():
try:
file = django.__file__
except AttributeError:
file = getattr(django, "__file__", None)
if file is None:
return ()
return (os.path.dirname(file),)

Expand Down
3 changes: 3 additions & 0 deletions docs/releases/6.0.3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Bugfixes
to :ref:`override<tuple-for-params>` ``as_sql()`` to accept any sequence
(:ticket:`36934`).

* Fixed :exc:`TypeError` when deprecation warnings are emitted in environments
importing Django by namespace (:ticket:`36961`).

* Fixed a visual regression where fieldset legends were misaligned in the admin
(:ticket:`36920`).

Expand Down
4 changes: 4 additions & 0 deletions tests/deprecation/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ def setUp(self):
def test_no_file(self):
orig_file = django.__file__
try:
# Depending on the cwd, Python might give a local checkout
# precedence over installed Django, producing None.
django.__file__ = None
self.assertEqual(django_file_prefixes(), ())
del django.__file__
self.assertEqual(django_file_prefixes(), ())
finally:
Expand Down