From db60a520857dfe1564d824809dacfffd55662a16 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 26 Jan 2014 15:36:55 +0100 Subject: [PATCH] [1.6.x] Fixed #21880 -- Added missing items to django.utils.timezone.__all__. Thanks Wim for the report. Backport of 2b154ae from master. --- django/utils/timezone.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/django/utils/timezone.py b/django/utils/timezone.py index 93ef4dfd57f..73749cf3ee1 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', ]