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 (parent:
494b3d2
)
fix TypeError
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 20 May 2011 16:57:16 +0000
(12:57 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 20 May 2011 16:57:16 +0000
(12:57 -0400)
sfa/rspecs/rspec.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/rspec.py
b/sfa/rspecs/rspec.py
index
6c40f99
..
0a7a96b
100755
(executable)
--- a/
sfa/rspecs/rspec.py
+++ b/
sfa/rspecs/rspec.py
@@
-37,7
+37,7
@@
class RSpec:
now = datetime.utcnow()
generated_ts = now.strftime(date_format)
expires_ts = (now + timedelta(hours=1)).strftime(date_format)
now = datetime.utcnow()
generated_ts = now.strftime(date_format)
expires_ts = (now + timedelta(hours=1)).strftime(date_format)
- self.parse_rspec(self.__get_template, self.namespaces)
+ self.parse_rspec(self.__get_template
()
, self.namespaces)
self.xml.set('valid_until', expires_ts)
self.xml.set('generated', generated_ts)
self.xml.set('valid_until', expires_ts)
self.xml.set('generated', generated_ts)
@@
-47,6
+47,7
@@
class RSpec:
"""
parser = etree.XMLParser(remove_blank_text=True)
try:
"""
parser = etree.XMLParser(remove_blank_text=True)
try:
+ print rspec
tree = etree.parse(rspec, parser)
except IOError:
# 'rspec' file doesnt exist. 'rspec' is proably an xml string
tree = etree.parse(rspec, parser)
except IOError:
# 'rspec' file doesnt exist. 'rspec' is proably an xml string