X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FLeases.py;h=72115164617b87786a7f2321fa418ce203de8cf0;hb=31996e41f306bb850e9309aaaf8d157137ece1f4;hp=cb8eed6411c9e4094dbaa839ab5c9f11f3005915;hpb=3d755d649580518c105f7a92701f61dcf3a1c550;p=plcapi.git diff --git a/PLC/Leases.py b/PLC/Leases.py index cb8eed6..7211516 100644 --- a/PLC/Leases.py +++ b/PLC/Leases.py @@ -58,10 +58,10 @@ class Lease(Row): # return a SQL string return Timestamp.sql_validate_utc(timestamp) - # round UP + # round UP def validate_t_from(self,timestamp): return self.validate_time (timestamp, round_up=True) - # round DOWN + # round DOWN def validate_t_until (self, timestamp): return self.validate_time (timestamp, round_up=False) @@ -80,10 +80,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)