diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-01-26 15:36:55 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-01-26 15:36:55 +0100 |
| commit | db60a520857dfe1564d824809dacfffd55662a16 (patch) | |
| tree | b6e0ac7fa5bfd06a2fd580ab9689df0dfdb9afca /django | |
| parent | a0a6112afc08c7471b70ee5e35170dfee3b488f3 (diff) | |
[1.6.x] Fixed #21880 -- Added missing items to django.utils.timezone.__all__.
Thanks Wim for the report.
Backport of 2b154ae from master.
Diffstat (limited to 'django')
| -rw-r--r-- | django/utils/timezone.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/django/utils/timezone.py b/django/utils/timezone.py index 93ef4dfd57..73749cf3ee 100644 --- a/django/utils/timezone.py +++ b/django/utils/timezone.py @@ -18,9 +18,12 @@ from django.conf import settings from django.utils import six __all__ = [ - 'utc', 'get_default_timezone', 'get_current_timezone', + 'utc', + 'get_default_timezone', 'get_default_timezone_name', + 'get_current_timezone', 'get_current_timezone_name', 'activate', 'deactivate', 'override', - 'is_naive', 'is_aware', 'make_aware', 'make_naive', + 'localtime', 'now', + 'is_aware', 'is_naive', 'make_aware', 'make_naive', ] |