From: Tony Mack Date: Wed, 30 Nov 2011 18:34:49 +0000 (-0500) Subject: rspec_version.to_string() is no loger necessary X-Git-Tag: sfa-2.0-2~39 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=98244974bd6c98013a2c8bcf8362c7e5b624f419;p=sfa.git rspec_version.to_string() is no loger necessary --- diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index 5fe1d6f7..e804ef80 100644 --- a/sfa/managers/aggregate_manager.py +++ b/sfa/managers/aggregate_manager.py @@ -305,7 +305,7 @@ class AggregateManager: version_manager = VersionManager() # get the rspec's return format from options rspec_version = version_manager.get_version(options.get('rspec_version')) - version_string = "rspec_%s" % (rspec_version.to_string()) + version_string = "rspec_%s" % (rspec_version) #panos adding the info option to the caching key (can be improved) if options.get('info'): diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py index 9eef80b3..2fce1399 100644 --- a/sfa/managers/slice_manager.py +++ b/sfa/managers/slice_manager.py @@ -142,7 +142,7 @@ class SliceManager: # get the rspec's return format from options rspec_version = version_manager.get_version(options.get('rspec_version')) - version_string = "rspec_%s" % (rspec_version.to_string()) + version_string = "rspec_%s" % (rspec_version) # look in cache first if self.caching and api.cache and not xrn: diff --git a/sfa/rspecs/baseversion.py b/sfa/rspecs/baseversion.py index 8e311b71..4e387293 100644 --- a/sfa/rspecs/baseversion.py +++ b/sfa/rspecs/baseversion.py @@ -24,7 +24,7 @@ class BaseVersion: 'extensions': self.extensions } - def to_string(self): + def __str__(self): return "%s %s" % (self.type, self.version)