Merge c72f08d into e38affc

CHANGELOG.txt

@@ -1,3 +1,7 @@
+=== 0.2.1 (unreleased) ===
+- Fix bug that could occur sometimes in herald.contrib.auth when reversing the password reset url
+
+
 === 0.2 (08-16-2018) ===
 - Drop official support for django < 1.11 and python 3.2-3.3
 - Changed Notification.notification_class and Notification.verbose_name fields to have less restrictive `max_length`

herald/__init__.py

@@ -1,7 +1,7 @@
 """
 Notification classes. Used for sending texts and emails
 """
-__version__ = '0.2'
+__version__ = '0.2.1b1'
 
 default_app_config = 'herald.apps.HeraldConfig'
 

herald/contrib/auth/notifications.py

@@ -6,7 +6,7 @@
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.models import Site
 from django.template import loader
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_text
 from django.utils.http import urlsafe_base64_encode
 from django.urls import reverse
 
@@ -45,7 +45,7 @@ def get_context_data(self):
             self.domain = current_site.domain
 
         protocol = 'https' if self.use_https else 'http'
-        uid = urlsafe_base64_encode(force_bytes(self.user.pk))
+        uid = force_text(urlsafe_base64_encode(force_bytes(self.user.pk)))
         token = self.token_generator.make_token(self.user)
 
         context.update({