Skip to content

Commit 2b0b5b7

Browse files
committed
New release with minor bug fix
1 parent 4e59eab commit 2b0b5b7

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed
25.7 KB
Binary file not shown.

dist/django_utz-0.1.8.tar.gz

25.5 KB
Binary file not shown.

django_utz/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@Author: Daniel T. Afolayan (ti-oluwa.github.io)
88
"""
99

10-
__version__ = "0.1.7"
10+
__version__ = "0.1.8"
1111
__author__ = "Daniel T. Afolayan"
1212

1313
alias = "django-user-timezone"

django_utz/templatetags/django_utz.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
from typing import Dict, List
44
from django.template.base import Parser, Token, Node, FilterExpression, kwarg_re
55
from django.template import Library, TemplateSyntaxError, NodeList
6-
from django.conf import settings
76
from django.utils import timezone
87
import datetime
98

9+
from django.utils.safestring import SafeText
10+
1011
from ..middleware import get_request_user
1112
from ..decorators.models import UserModelUTZMixin
13+
from ..datetime import utzdatetime
14+
1215

1316
register = Library()
1417
_generic_name = "usertimezone"
@@ -89,10 +92,9 @@ def get_user(
8992
return user
9093

9194

92-
def render(self, context):
95+
def render(self, context) -> SafeText:
9396
request_user = context.get("request").user
94-
if self.user:
95-
preferred_user = self.user.resolve(context)
97+
preferred_user = self.user.resolve(context) if self.user else None
9698
user = preferred_user if preferred_user else request_user
9799

98100
utz_meta = getattr(user, "UTZMeta", None)
@@ -113,7 +115,7 @@ def render(self, context):
113115

114116

115117
@register.tag(name=_generic_name)
116-
def utz_tag(parser: Parser, token: Token):
118+
def utz_tag(parser: Parser, token: Token) -> UTZNode:
117119
"""
118120
Template tag to render datetimes in the template content
119121
in the preferred user's timezone.
@@ -144,7 +146,7 @@ def utz_tag(parser: Parser, token: Token):
144146

145147

146148
@register.filter(name=_generic_name)
147-
def utz_filter(value: datetime.datetime, user: UserModelUTZMixin = None):
149+
def utz_filter(value: datetime.datetime, user: UserModelUTZMixin = None) -> datetime.datetime | utzdatetime:
148150
"""
149151
Filter to convert a datetime object to the request/provided user's timezone.
150152

0 commit comments

Comments
 (0)