django.utils.timezone.override helper may raise AttributeError

[Rafal Stozek]

Here's a simple test case:

>>> from django.utils import timezone
>>> timezone.deactivate()
>>> with timezone.override(None):
...     pass
... 
Traceback (most recent call last):
  File "<console>", line 2, in <module>
  File "/django/django/utils/timezone.py", line 204, in __exit__
    del _active.value
AttributeError: value

This happens in __exit__() method of override helper when current timezone is deactivated and we try to use override with None argument (which is valid - it means that we want to deactivate current timezone).

[Rafal Stozek]

Sent pull request: ​https://github.com/django/django/pull/689

[Aymeric Augustin]

The fix looks good.

I'm less convinced by the setUp and tearDown methods you added. As far as I can tell wrapping the whole test in:

try:
    ...
finally:
    deactivate()

would suffice.

[Aymeric Augustin]

The tests in the PR won't run without pytz. (EDIT: in fact, they do, but there's a typo: TIMEZONE vs. TIME_ZONE).

I'll modify the tests and commit your fix.

[Aymeric Augustin <aymeric.augustin@…>]

In db49b6d2b298bc53b55df9ee7cf80e6492d3116b:

[1.5.x] Fixed #19708 -- Exception in timezone.override(None).

Thanks rafales.

Backport of 9a4a1ce.

[Aymeric Augustin <aymeric.augustin@…>]

In 9a4a1ce323237d0aadafbddcd270c47be251bac2:

Fixed #19708 -- Exception in timezone.override(None).

Thanks rafales.

[Aymeric Augustin <aymeric.augustin@…>]

In db49b6d2b298bc53b55df9ee7cf80e6492d3116b:

[1.5.x] Fixed #19708 -- Exception in timezone.override(None).

Thanks rafales.

Backport of 9a4a1ce.