Merge branch 'release/1.3.2'

example_project/requirements.txt

@@ -1,2 +1,2 @@
-Django==2.0.3
+Django==2.2.10
 pytz==2018.3

hitcount/__init__.py

@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
 
-VERSION = (1, 3, 1)
+VERSION = (1, 3, 2)
 
 __version__ = '.'.join(str(i) for i in VERSION)

hitcount/managers.py

@@ -27,7 +27,7 @@ def filter_active(self, *args, **kwargs):
         same user/visitor *ever* be counted twice?  After a week, or a month,
         or a year, should their view be counted again?
 
-        The defaulf is to consider a visitor's hit still 'active' if they
+        The default is to consider a visitor's hit still 'active' if they
         return within a the last seven days..  After that the hit
         will be counted again.  So if one person visits once a week for a year,
         they will add 52 hits to a given object.

hitcount/models.py

@@ -7,7 +7,6 @@
 from django.db.models import F
 from django.utils import timezone
 from django.dispatch import receiver
-from six import python_2_unicode_compatible
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext_lazy as _
@@ -32,7 +31,6 @@ def delete_hit_count_handler(sender, instance, save_hitcount=False, **kwargs):
         instance.hitcount.decrease()
 
 
-@python_2_unicode_compatible
 class HitCount(models.Model):
     """
     Model that stores the hit totals for any content object.
@@ -95,7 +93,6 @@ def hits_in_last(self, **kwargs):
     #     pass
 
 
-@python_2_unicode_compatible
 class Hit(models.Model):
     """
     Model captures a single Hit by a visitor.
@@ -155,7 +152,6 @@ def delete(self, save_hitcount=False):
         super(Hit, self).delete()
 
 
-@python_2_unicode_compatible
 class BlacklistIP(models.Model):
 
     ip = models.CharField(max_length=40, unique=True)
@@ -169,7 +165,6 @@ def __str__(self):
         return '%s' % self.ip
 
 
-@python_2_unicode_compatible
 class BlacklistUserAgent(models.Model):
 
     user_agent = models.CharField(max_length=255, unique=True)