Merge branch 'master' into senslab2

[sfa.git] / sfa / rspecs / rspec.py

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 00095e2..f8bbe80 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -2,7 +2,7 @@
 from datetime import datetime, timedelta
 
 from sfa.util.xml import XML, XpathFilter
-from sfa.util.faults import InvalidRSpecElement
+from sfa.util.faults import InvalidRSpecElement, InvalidRSpec
 
 from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements 
 from sfa.rspecs.version_manager import VersionManager
@@ -19,9 +19,10 @@ class RSpec:
         self.elements = {}
         if rspec:
             self.parse_xml(rspec)
-        else:
+        elif version:
             self.create(version)
-
+        else:
+            raise InvalidRSpec("No RSpec or version sepcified. Must specify a valid rspec string or a valid version") 
     def create(self, version=None):
         """
         Create root element