You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by sc...@apache.org on 2011/01/04 07:00:46 UTC
svn commit: r1054907 - in /gump/live/python/gump: actor/rdf/describer.py
core/run/gumpenv.py
Author: sctemme
Date: Tue Jan 4 06:00:46 2011
New Revision: 1054907
URL: http://svn.apache.org/viewvc?rev=1054907&view=rev
Log:
Make OSX bundled Python 2.6.1 happy, and fix the NAnt search
Modified:
gump/live/python/gump/actor/rdf/describer.py
gump/live/python/gump/core/run/gumpenv.py
Modified: gump/live/python/gump/actor/rdf/describer.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/actor/rdf/describer.py?rev=1054907&r1=1054906&r2=1054907&view=diff
==============================================================================
--- gump/live/python/gump/actor/rdf/describer.py (original)
+++ gump/live/python/gump/actor/rdf/describer.py Tue Jan 4 06:00:46 2011
@@ -36,14 +36,14 @@ from gump.core.model.module import *
from gump.core.model.state import *
from gump.util import *
-from rdflib.URIRef import URIRef
-from rdflib.Literal import Literal
-from rdflib.BNode import BNode
-from rdflib.Namespace import Namespace
-from rdflib.constants import TYPE
+from rdflib import URIRef
+from rdflib import Literal
+from rdflib import BNode
+from rdflib import Namespace
+from rdflib import TYPE
# Import RDFLib's default TripleStore implementation.
-from rdflib.TripleStore import TripleStore
+from rdflib import TripleStore
class RDFDescriber(AbstractRunActor):
Modified: gump/live/python/gump/core/run/gumpenv.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/run/gumpenv.py?rev=1054907&r1=1054906&r2=1054907&view=diff
==============================================================================
--- gump/live/python/gump/core/run/gumpenv.py (original)
+++ gump/live/python/gump/core/run/gumpenv.py Tue Jan 4 06:00:46 2011
@@ -414,8 +414,8 @@ class GumpEnvironment(Annotatable, Worka
def _check_nant(self):
if not self.checked:
- if not self._checkWithDashVersion('NAnt', "no NAnt builds"):
- if not self._checkWithDashVersion('NAnt.exe', "no NAnt builds"):
+ if not self._checkWithDashVersion('NAnt', "no NAnt builds", '-help'):
+ if not self._checkWithDashVersion('NAnt.exe', "no NAnt builds", '-help'):
self.noNAnt = self._checkWithDashVersion('nant',
"no NAnt builds",
'-help')