From 55ec919fe760f134fab50e445014fff3eb5f0f6e Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 2 May 2011 11:40:51 -0400 Subject: [PATCH] cosmetic --- sfa/rspecs/rspec_version.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sfa/rspecs/rspec_version.py b/sfa/rspecs/rspec_version.py index 4deb9240..2cd1517f 100644 --- a/sfa/rspecs/rspec_version.py +++ b/sfa/rspecs/rspec_version.py @@ -1,6 +1,9 @@ #!/usr/bin/python from sfa.util.sfalogging import sfa_logger + +DEFAULT_FORMAT='sfa' +DEFAULT_VERSION_NUMBER=1 class RSpecVersion: format = None @@ -13,20 +16,24 @@ class RSpecVersion: self.logger = sfa_logger() self.parse_version(version_raw) - def parse_version(self, version_raw): + def parse_version_string(self, version_string): # version_raw is currently a string but will # eventually be a struct. try: - format_split = version_raw.split(' ') + format_split = version_string.split(' ') format, version = format_split[0].lower(), format_split[1] except: - self.logger.info("RSpecVersion: invalid rspec version: %s , using default" \ - % version_raw) + self.logger.info("RSpecVersion: invalid rspec version string: %s , using default" \ + % version_string) # invalid format. Just continue - format, version = 'sfa', '1' + format, version = DEFAULT_FORMAT, DEFAULT_VERSION_NUMBER self.format = format self.version = version - + def parse_version_struct(self, version_struct): + try: + pass + except: + format, version = DEFAULT_FORMAT, DEFAULT_VERSION_NUMBER -- 2.43.0