X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FLeases.py;h=c1b2235a1af7c37bda2146ce5d52f0d158553c0f;hb=da06561d0f5240a5409474e16824e4e015f31fac;hp=4b967c6e0c3118b57cf492e5ad08a2f3569592d6;hpb=f7ce7ce813d4c44502629820a3583f32a99a98f7;p=plcapi.git

diff --git a/PLC/Leases.py b/PLC/Leases.py
index 4b967c6..c1b2235 100644
--- a/PLC/Leases.py
+++ b/PLC/Leases.py
@@ -1,8 +1,6 @@
 #
 # Functions for interacting with the leases table in the database
 #
-# $Id$
-# $URL$
 # Thierry Parmentelat -- INRIA
 #
 
@@ -52,18 +50,19 @@ class Lease(Row):
         # retrieve configured granularity
         granularity = self.api.config.PLC_RESERVATION_GRANULARITY
         # the trick for rounding up rather than down
-        if round_up: timestamp += (granularity-1)
+        if round_up:
+            timestamp += (granularity-1)
         # round down
         timestamp = (timestamp/granularity) * granularity
         # return a SQL string
         return Timestamp.sql_validate_utc(timestamp)
 
     # round UP
-    def validate_t_from(self,timestamp):
-        return self.validate_time (timestamp, round_up=True)
+    def validate_t_from(self, timestamp):
+        return self.validate_time(timestamp, round_up=True)
     # round DOWN
     def validate_t_until (self, timestamp):
-        return self.validate_time (timestamp, round_up=False)
+        return self.validate_time(timestamp, round_up=False)
 
 class Leases(Table):
     """
@@ -80,10 +79,7 @@ class Leases(Table):
 
 
         if lease_filter is not None:
-
-            if isinstance (lease_filter, int):
-                lease_filter = Filter (Lease.fields, {'lease_id': lease_filter})
-            elif isinstance(lease_filter, (list, tuple, set)):
+            if isinstance(lease_filter, (list, tuple, set, int, long)):
                 lease_filter = Filter(Lease.fields, {'lease_id': lease_filter})
             elif isinstance(lease_filter, dict):
                 lease_filter = LeaseFilter(Lease.fields, lease_filter)