import os
from sfa.util.faults import InvalidRSpec, UnsupportedRSpecVersion
-from sfa.rspecs.baseversion import BaseVersion
+from sfa.rspecs.version import RSpecVersion
from sfa.util.sfalogging import logger
class VersionManager:
versions_path = path + os.sep + 'versions'
versions_module_path = 'sfa.rspecs.versions'
valid_module = lambda x: os.path.isfile(os.sep.join([versions_path, x])) \
- and not x.endswith('.pyc') and x not in ['__init__.py']
+ and x.endswith('.py') and x != '__init__.py'
files = [f for f in os.listdir(versions_path) if valid_module(f)]
for filename in files:
basename = filename.split('.')[0]
retval = None
for version in self.versions:
if type is None or type.lower() == version.type.lower():
- if version_num is None or str(version_num) == version.version:
+ if version_num is None or str(float(version_num)) == str(float(version.version)):
if content_type is None or content_type.lower() == version.content_type.lower() \
or version.content_type == '*':
retval = version
if num_parts > 2:
content_type = version_parts[2]
retval = self._get_version(type, version_num, content_type)
- elif isinstance(version, BaseVersion):
+ elif isinstance(version, RSpecVersion):
retval = version
+ elif not version:
+ retval = self.versions[0]
else:
raise UnsupportedRSpecVersion("No such version: %s "% str(version))