Merge pull request #2093 from fstagni/fixesWMSv6r11

[v6r11] Some fixes for WMS
DIRACGrid · Oct 1, 2014 · 5e0f8d5 · 5e0f8d5
2 parents cb6b5db + e2b5cc2
commit 5e0f8d5
Show file tree

Hide file tree

Showing 16 changed files with 284 additions and 808 deletions.
diff --git a/Core/Utilities/TimeSeries.py b/Core/Utilities/TimeSeries.py
@@ -6,7 +6,7 @@
 
 import datetime
 
-class TimeSeries:
+class TimeSeries( object ):
 
   ###########################################################################
   def __init__( self, maxEntries = False, maxAge = False, minAge = False ):
@@ -23,6 +23,12 @@ def __repr__( self ):
   def __str__( self ):
     return str( self.convertToList() )
 
+  ###########################################################################
+  def __nonzero__( self ):
+    """ for comparisons
+    """
+    return True
+
   ###########################################################################
   def __len__( self ):
     return len( self.data )

diff --git a/DataManagementSystem/Client/FTSJob.py b/DataManagementSystem/Client/FTSJob.py
@@ -409,6 +409,11 @@ def fileStatusList( self ):
     """ get list of files statuses """
     return [ ftsFile.Status for ftsFile in self ]
 
+  def __nonzero__( self ):
+    """ for comparisons
+    """
+    return True
+
   def __len__( self ):
     """ nb of subFiles """
     return len( self.__files__ )

diff --git a/RequestManagementSystem/Client/Operation.py b/RequestManagementSystem/Client/Operation.py
@@ -204,6 +204,11 @@ def fileStatusList( self ):
     """ get list of files statuses """
     return [ subFile.Status for subFile in self ]
 
+  def __nonzero__( self ):
+    """ for comparisons
+    """
+    return True
+
   def __len__( self ):
     """ nb of subFiles """
     return len( self.__files__ )

diff --git a/RequestManagementSystem/Client/Request.py b/RequestManagementSystem/Client/Request.py
@@ -270,6 +270,11 @@ def indexOf( self, subReq ):
     """ return index of subReq (execution order) """
     return self.__operations__.index( subReq ) if subReq in self else -1
 
+  def __nonzero__( self ):
+    """ for comparisons
+    """
+    return True
+
   def __len__( self ):
     """ nb of subRequests """
     return len( self.__operations__ )