git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1e85b3c
)
fix attribute errors
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 26 Oct 2011 19:04:31 +0000
(15:04 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 26 Oct 2011 19:04:31 +0000
(15:04 -0400)
sfa/rspecs/rspec.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/rspec.py
b/sfa/rspecs/rspec.py
index
00e048b
..
a04ff28
100755
(executable)
--- a/
sfa/rspecs/rspec.py
+++ b/
sfa/rspecs/rspec.py
@@
-70,7
+70,7
@@
class RSpec:
def get(self, element_type, filter={}, depth=0):
elements = self.get_elements(element_type, filter)
def get(self, element_type, filter={}, depth=0):
elements = self.get_elements(element_type, filter)
- elements = [self.
get_element_attributes(element, depth=depth) for element
in elements]
+ elements = [self.
xml.get_element_attributes(elem, depth=depth) for elem
in elements]
return elements
def get_elements(self, element_type, filter={}):
return elements
def get_elements(self, element_type, filter={}):
@@
-83,7
+83,7
@@
class RSpec:
raise InvalidRSpecElement(element_type, extra=msg)
rspec_element = self.get_rspec_element(element_type)
xpath = rspec_element.path + XpathFilter.xpath(filter)
raise InvalidRSpecElement(element_type, extra=msg)
rspec_element = self.get_rspec_element(element_type)
xpath = rspec_element.path + XpathFilter.xpath(filter)
- return self.xpath(xpath)
+ return self.x
ml.x
path(xpath)
def merge(self, in_rspec):
self.version.merge(in_rspec)
def merge(self, in_rspec):
self.version.merge(in_rspec)