Skip to content

fixed error in get_message under django 2.2+ (#9 rebased to master) #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IlyaSemenov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed error in get_message under django 2.2+ (#9 rebased to master) #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions shared_session/templatetags/shared_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from django.contrib.sessions.backends.base import UpdateError
from django.urls import reverse
from django.utils import timezone
from django.utils.encoding import force_text
from django.utils.http import urlsafe_base64_encode

register = template.Library()
Expand Down Expand Up @@ -55,12 +56,7 @@ def get_message(self, request, domain):
'dst': domain,
'ts': timezone.now().isoformat()
})
data = urlsafe_base64_encode(enc_payload)
try:
return data.decode('ascii') # Django versions prior to 2.2 don't return `str` automatically
except AttributeError:
return data

return force_text(urlsafe_base64_encode(enc_payload), encoding='ascii')

def build_url(self, domain, message):
return urljoin(domain, reverse('shared_session:share', kwargs={'message': message}))
Expand Down