gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1766260 - /gump/live/python/gump/core/model/builder.py
Date Sun, 23 Oct 2016 09:32:43 GMT
Author: bodewig
Date: Sun Oct 23 09:32:42 2016
New Revision: 1766260

URL: http://svn.apache.org/viewvc?rev=1766260&view=rev
Log:
pull timeout up from BaseAnt to Builder

Modified:
    gump/live/python/gump/core/model/builder.py

Modified: gump/live/python/gump/core/model/builder.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/builder.py?rev=1766260&r1=1766259&r2=1766260&view=diff
==============================================================================
--- gump/live/python/gump/core/model/builder.py (original)
+++ gump/live/python/gump/core/model/builder.py Sun Oct 23 09:32:42 2016
@@ -47,6 +47,11 @@ class Builder(ModelObject, PropertyConta
         # Store owning project
         self.project = project
 
+        # Import the timeout
+        self.timeout = self.getDomAttributeValue('timeout')
+        if self.timeout is not None:
+            self.timeout = float(self.timeout)
+
     def __str__(self):
         """
         Display what project this is on, if possible.
@@ -226,6 +231,14 @@ class Builder(ModelObject, PropertyConta
     def getBaseDirectory(self):
         return self.basedir
 
+    def hasTimeout(self):
+        if self.timeout:
+            return True
+        return False
+
+    def getTimeout(self):
+        return self.timeout
+
 # represents an <ant/> element
 class BaseAnt(Builder):
     """ An Ant command (within a project)"""
@@ -236,10 +249,6 @@ class BaseAnt(Builder):
         self.target = self.getDomAttributeValue('target')
         # Import the buildfile
         self.buildfile = self.getDomAttributeValue('buildfile')
-        # Import the timeout
-        self.timeout = self.getDomAttributeValue('timeout')
-        if self.timeout is not None:
-            self.timeout = float(self.timeout)
 
     def hasTarget(self):
         if self.target:
@@ -257,14 +266,6 @@ class BaseAnt(Builder):
     def getBuildFile(self):
         return self.buildfile
 
-    def hasTimeout(self):
-        if self.timeout:
-            return True
-        return False
-
-    def getTimeout(self):
-        return self.timeout
-
     def dump(self, indent=0, output=sys.stdout):
         """ Display the contents of this object """
         Builder.dump(self, indent, output)



Mime
View raw message