From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 3 May 2011 12:12:31 +0000 (-0400)
Subject: cleanup
X-Git-Tag: sfa-1.0-21-ckp1~8
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=72790b8c8a3545c6334b9b6f70b4975a7ce0d1d3

cleanup
---

diff --git a/sfa/rspecs/rspec_version.py b/sfa/rspecs/rspec_version.py
index 98ff7453..5caa5442 100644
--- a/sfa/rspecs/rspec_version.py
+++ b/sfa/rspecs/rspec_version.py
@@ -2,12 +2,10 @@
 from sfa.util.sfalogging import _SfaLogger
 
 
-DEFAULT_FORMAT='sfa'
-DEFAULT_VERSION_NUMBER=1
 class RSpecVersion:
 
-    format = None
-    version = None
+    format = 'sfa'
+    version = '1'
     schema = None
     namespace = None
     extensions = []
@@ -19,21 +17,15 @@ class RSpecVersion:
     def parse_version_string(self, version_string):
         # version_raw is currently a string but will 
         # eventually be a struct.
-        try:
-            format_split = version_string.split(' ')
-            format, version = format_split[0].lower(), format_split[1]
-        except:
-            self.logger.info("RSpecVersion: invalid rspec version string: %s , using default" \
-                        % version_string)
-            # invalid format. Just continue
-            format, version = DEFAULT_FORMAT, DEFAULT_VERSION_NUMBER
-
-        self.format = format
-        self.version = version 
+        format_split = version_string.split(' ')
+        try: self.format = format_split[0].lower()  
+        except: pass
+        try: self.version = format_split[1]
+        except: pass
     
 
     def parse_version_struct(self, version_struct):
         try:
             pass
         except:
-            format, version = DEFAULT_FORMAT, DEFAULT_VERSION_NUMBER
+            pass