From 2720f06789eaa12e417ec3973975ced204d7846e Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 31 May 2020 18:20:05 -0700
Subject: [PATCH] better session2trash logging

---
 gluon/packages/dal        |  2 +-
 scripts/sessions2trash.py | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gluon/packages/dal b/gluon/packages/dal
index 252e004b..651afafc 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit 252e004be84d2b5c0642033e9024921ebf75c802
+Subproject commit 651afafcf5001ca9e4bbb78aad8e8e33ddbb26b4
diff --git a/scripts/sessions2trash.py b/scripts/sessions2trash.py
index 228cf73f..867c169d 100755
--- a/scripts/sessions2trash.py
+++ b/scripts/sessions2trash.py
@@ -41,7 +41,7 @@ from __future__ import with_statement
 from gluon import current
 from gluon.storage import Storage
 from gluon._compat import pickle
-from optparse import OptionParser
+
 import datetime
 import stat
 import time
@@ -62,13 +62,12 @@ class SessionSet(object):
 
     def get(self):
         """Get session files/records."""
-        raise NotImplementedError
+        raise NotImplementedError()
 
     def trash(self):
         """Trash expired sessions."""
         now = datetime.datetime.now()
         for item in self.get():
-            status = 'OK'
             last_visit = item.last_visit_default()
 
             try:
@@ -88,16 +87,18 @@ class SessionSet(object):
             if age > self.expiration or not self.expiration:
                 item.delete()
                 status = 'trashed'
+            else:
+                status = 'OK'
 
             if self.verbose > 1:
-                print('key: %s' % str(item))
+                print('key: %s' % item)
                 print('expiration: %s seconds' % self.expiration)
-                print('last visit: %s' % str(last_visit))
+                print('last visit: %s' % last_visit)
                 print('age: %s seconds' % age)
                 print('status: %s' % status)
                 print('')
             elif self.verbose > 0:
-                print('%s %s' % (str(item), status))
+                print('%s %s' % (item, status))
 
 
 class SessionSetDb(SessionSet):
@@ -179,8 +180,8 @@ class SessionFile(object):
 
     def get(self):
         session = Storage()
-        with open(self.filename, 'rb+') as f:
-            session.update(cPickle.load(f))
+        with open(self.filename, 'rb') as f:
+            session.update(pickle.load(f))
         return session
 
     def last_visit_default(self):
@@ -198,8 +199,7 @@ def total_seconds(delta):
     Args:
         delta: datetime.timedelta instance.
     """
-    return (delta.microseconds + (delta.seconds + (delta.days * 24 * 3600)) *
-            10 ** 6) / 10 ** 6
+    return (delta.microseconds + (delta.seconds + (delta.days * 86400)) * 1000000) / 1e6
 
 def single_loop(expiration=None, force=False, verbose=False):
     if expiration is None:
@@ -216,9 +216,9 @@ def single_loop(expiration=None, force=False, verbose=False):
 
 def main():
     """Main processing."""
+    from optparse import OptionParser
 
-    usage = '%prog [options]' + '\nVersion: %s' % VERSION
-    parser = OptionParser(usage=usage)
+    parser = OptionParser(usage="%%prog [options]\nVersion: %s" % VERSION)
 
     parser.add_option('-f', '--force',
                       action='store_true', dest='force', default=False,