change the logic of clipping leases

[plcapi.git] / PLC / Leases.py

diff --git a/PLC/Leases.py b/PLC/Leases.py
index c1b2235..9da3d3b 100644 (file)
--- a/PLC/Leases.py
+++ b/PLC/Leases.py
@@ -53,7 +53,7 @@ class Lease(Row):
         if round_up:
             timestamp += (granularity-1)
         # round down
-        timestamp = (timestamp/granularity) * granularity
+        timestamp = (timestamp // granularity) * granularity
         # return a SQL string
         return Timestamp.sql_validate_utc(timestamp)
 
@@ -75,16 +75,16 @@ class Leases(Table):
 
         # the view that we're selecting upon: start with view_leases
         view = "view_leases"
-        sql = "SELECT %s FROM %s WHERE true" % (", ".join(self.columns.keys()),view)
+        sql = "SELECT %s FROM %s WHERE true" % (", ".join(list(self.columns.keys())),view)
 
 
         if lease_filter is not None:
-            if isinstance(lease_filter, (list, tuple, set, int, long)):
+            if isinstance(lease_filter, (list, tuple, set, int)):
                 lease_filter = Filter(Lease.fields, {'lease_id': lease_filter})
             elif isinstance(lease_filter, dict):
                 lease_filter = LeaseFilter(Lease.fields, lease_filter)
             else:
-                raise PLCInvalidArgument, "Wrong lease filter %r"%lease_filter
+                raise PLCInvalidArgument("Wrong lease filter %r"%lease_filter)
             sql += " AND (%s) %s" % lease_filter.sql(api)
 
         self.selectall(sql)