git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for merging PG rspecs
[sfa.git]
/
sfa
/
rspecs
/
rspec.py
diff --git
a/sfa/rspecs/rspec.py
b/sfa/rspecs/rspec.py
index
fe80006
..
de7e250
100755
(executable)
--- a/
sfa/rspecs/rspec.py
+++ b/
sfa/rspecs/rspec.py
@@
-10,11
+10,11
@@
from sfa.util.faults import SfaNotImplemented, InvalidRSpec
class RSpec:
header = '<?xml version="1.0"?>\n'
template = """<RSpec></RSpec>"""
class RSpec:
header = '<?xml version="1.0"?>\n'
template = """<RSpec></RSpec>"""
- namespaces = {}
config = Config()
xml = None
type = None
config = Config()
xml = None
type = None
- version = None
+ version = None
+ namespaces = None
def __init__(self, rspec="", namespaces={}):
if rspec:
def __init__(self, rspec="", namespaces={}):
if rspec:
@@
-87,6
+87,8
@@
class RSpec:
if opt.text == value:
elem.remove(opt)
if opt.text == value:
elem.remove(opt)
+ def merge(self, in_rspec):
+ pass
def validate(self, schema):
"""
def validate(self, schema):
"""