Fix cache

flaskbb/_compat.py

@@ -16,7 +16,6 @@ if not PY2:     # pragma: no cover
     iterkeys = lambda d: iter(d.keys())
     itervalues = lambda d: iter(d.values())
     iteritems = lambda d: iter(d.items())
-    max_integer = sys.maxsize
 else:           # pragma: no cover
     text_type = unicode
     string_types = (str, unicode)
@@ -26,7 +25,6 @@ else:           # pragma: no cover
     iterkeys = lambda d: d.iterkeys()
     itervalues = lambda d: d.itervalues()
     iteritems = lambda d: d.iteritems()
-    max_integer = sys.maxint
 
 
 def to_bytes(text):

flaskbb/management/models.py

@@ -12,7 +12,7 @@ from wtforms import (TextField, IntegerField, FloatField, BooleanField,
                      SelectField, SelectMultipleField, validators)
 from flask_wtf import FlaskForm
 
-from flaskbb._compat import max_integer, text_type, iteritems
+from flaskbb._compat import text_type, iteritems
 from flaskbb.extensions import db, cache
 from flaskbb.utils.database import CRUDMixin
 
@@ -204,7 +204,7 @@ class Setting(db.Model, CRUDMixin):
         return settings
 
     @classmethod
-    @cache.memoize(timeout=max_integer)
+    @cache.cached(key_prefix="settings")
     def as_dict(cls, from_group=None, upper=True):
         """Returns all settings as a dict. This method is cached. If you want
         to invalidate the cache, simply execute ``self.invalidate_cache()``.

flaskbb/user/models.py

@@ -12,7 +12,6 @@ from werkzeug.security import generate_password_hash, check_password_hash
 from flask import url_for
 from flask_login import UserMixin, AnonymousUserMixin
 
-from flaskbb._compat import max_integer
 from flaskbb.extensions import db, cache
 from flaskbb.exceptions import AuthenticationError
 from flaskbb.utils.helpers import time_utcnow
@@ -330,12 +329,12 @@ class User(db.Model, UserMixin, CRUDMixin):
         return self.secondary_groups.filter(
             groups_users.c.group_id == group.id).count() > 0
 
-    @cache.memoize(timeout=max_integer)
+    @cache.memoize()
     def get_groups(self):
         """Returns all the groups the user is in."""
         return [self.primary_group] + list(self.secondary_groups)
 
-    @cache.memoize(timeout=max_integer)
+    @cache.memoize()
     def get_permissions(self, exclude=None):
         """Returns a dictionary with all permissions the user has"""
         if exclude:
@@ -352,7 +351,7 @@ class User(db.Model, UserMixin, CRUDMixin):
                 perms[c] = getattr(group, c) or perms.get(c, False)
         return perms
 
-    @cache.memoize(timeout=max_integer)
+    @cache.memoize()
     def get_unread_messages(self):
         """Returns all unread messages for the user."""
         unread_messages = Conversation.query.\
@@ -463,11 +462,11 @@ class Guest(AnonymousUserMixin):
     def groups(self):
         return self.get_groups()
 
-    @cache.memoize(timeout=max_integer)
+    @cache.memoize()
     def get_groups(self):
         return Group.query.filter(Group.guest == True).all()
 
-    @cache.memoize(timeout=max_integer)
+    @cache.memoize()
     def get_permissions(self, exclude=None):
         """Returns a dictionary with all permissions the user has"""
         if exclude: