X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec.py;h=8ed637d9c62af9222a687254dce4bc4ef6b92025;hb=c1623056cb0a51c3817425ceee85aec3c62c57f3;hp=96523f0012adfcfc76419c129194192f35e5dd1a;hpb=afd1975bd5261925a490a7db1647ebda40f2d54c;p=sfa.git

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 96523f00..8ed637d9 100755
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -10,11 +10,15 @@ from sfa.util.faults import SfaNotImplemented, InvalidRSpec
 class RSpec:
     header = '<?xml version="1.0"?>\n'
     template = """<RSpec></RSpec>"""
-    namespaces = {}
     config = Config()
     xml = None
+    type = None
+    version = None
+    namespaces = None    
+    user_options = {}
   
-    def __init__(self, rspec="", namespaces={}):
+    def __init__(self, rspec="", namespaces={}, user_options={}):
+	self.user_options = user_options
         if rspec:
             self.parse_rspec(rspec, namespaces)
         else:
@@ -85,6 +89,8 @@ class RSpec:
                     if opt.text == value:
                         elem.remove(opt)
 
+    def merge(self, in_rspec):
+        pass
 
     def validate(self, schema):
         """