Rename Store class in rate_limit.py to Gcra. The name Store makes no

sense since the class implements a Gcra, I'll call it Gcra....

Author: rouilj

roundup/cgi/actions.py

@@ -5,7 +5,7 @@
 from roundup.i18n import _
 from roundup.cgi import exceptions, templating
 from roundup.mailgw import uidFromAddress
-from roundup.rate_limit import Store, RateLimit
+from roundup.rate_limit import Gcra, RateLimit
 from roundup.exceptions import Reject, RejectRaw
 from roundup.anypy import urllib_
 from roundup.anypy.strings import StringIO
@@ -1235,27 +1235,27 @@ def handle(self):
             # Use prefix to prevent key collisions maybe??
             rlkey="LOGIN-" + self.client.user
             limit=self.loginLimit
-            s=Store()
+            gcra=Gcra()
             otk=self.client.db.Otk
             try:
                 val=otk.getall(rlkey)
-                s.set_tat_as_string(rlkey, val['tat'])
+                gcra.set_tat_as_string(rlkey, val['tat'])
             except KeyError:
                 # ignore if tat not set, it's 1970-1-1 by default.
                 pass
             # see if rate limit exceeded and we need to reject the attempt
-            reject=s.update(rlkey, limit)
+            reject=gcra.update(rlkey, limit)
 
             # Calculate a timestamp that will make OTK expire the
             # unused entry 1 hour in the future
             ts = time.time() - (60 * 60 * 24 * 7) + 3600
-            otk.set(rlkey, tat=s.get_tat_as_string(rlkey),
+            otk.set(rlkey, tat=gcra.get_tat_as_string(rlkey),
                                    __timestamp=ts)
             otk.commit()
 
             if reject:
                 # User exceeded limits: find out how long to wait
-                status=s.status(rlkey, limit)
+                status=gcra.status(rlkey, limit)
                 raise Reject(_("Logins occurring too fast. Please wait: %d seconds.")%status['Retry-After'])
             else:
                 self.verifyLogin(self.client.user, password)

roundup/rate_limit.py

@@ -16,7 +16,7 @@ def inverse(self):
         return self.period.total_seconds() / self.count
 
 
-class Store:
+class Gcra:
 
     memory = {}
 
@@ -82,7 +82,7 @@ def status(self, key, limit):
 
         # static defined headers according to limit
         ret['X-RateLimit-Limit'] = limit.count
-        ret['X-RateLimit-Limit-Period'] = limit.period.total_seconds()
+        ret['X-RateLimit-Limit-Period'] = int(limit.period.total_seconds())
 
         # status of current limit as of now
         now = datetime.utcnow()