python3 - 2to3 + miscell obvious tweaks

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

diff --git a/sfa/rspecs/version_manager.py b/sfa/rspecs/version_manager.py
index 2eabaa4..b4daf42 100644 (file)
--- a/sfa/rspecs/version_manager.py
+++ b/sfa/rspecs/version_manager.py
@@ -1,23 +1,33 @@
+
+
 import os
 from sfa.util.faults import InvalidRSpec, UnsupportedRSpecVersion
-from sfa.rspecs.baseversion import BaseVersion 
-from sfa.util.sfalogging import logger    
+from sfa.rspecs.version import RSpecVersion
+from sfa.util.sfalogging import logger
+from sfa.util.py23 import StringType
+
 
 class VersionManager:
+
     def __init__(self):
         self.versions = []
         self.load_versions()
 
+    def __repr__(self):
+        return "<VersionManager with {} flavours: [{}]>"\
+            .format(len(self.versions),
+                    ", ".join([str(x) for x in self.versions]))
+
     def load_versions(self):
-        path = os.path.dirname(os.path.abspath( __file__ ))
+        path = os.path.dirname(os.path.abspath(__file__))
         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]
-            module_path = versions_module_path +'.'+basename
+            module_path = versions_module_path + '.' + basename
             module = __import__(module_path, fromlist=module_path)
             for attr_name in dir(module):
                 attr = getattr(module, attr_name)
@@ -28,22 +38,25 @@ class VersionManager:
         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 == '*':
+                            or version.content_type == '*':
                         retval = version
-                        ### sounds like we should be glad with the first match, not the last one
+                        # sounds like we should be glad with the first match,
+                        # not the last one
                         break
         if not retval:
-            raise UnvalidRSpecVersion("%s %s is not suported here"% (type, version_num, content_type))
+            raise UnsupportedRSpecVersion(
+                "[%s %s %s] is not suported here" % (type, version_num, content_type))
         return retval
 
     def get_version(self, version=None):
         retval = None
         if isinstance(version, dict):
-            retval =  self._get_version(version.get('type'), version.get('version'), version.get('content_type'))
-        elif isinstance(version, basestring):
-            version_parts = version.split(' ')     
+            retval = self._get_version(version.get('type'), version.get(
+                'version'), version.get('content_type'))
+        elif isinstance(version, StringType):
+            version_parts = version.split(' ')
             num_parts = len(version_parts)
             type = version_parts[0]
             version_num = None
@@ -52,12 +65,15 @@ class VersionManager:
                 version_num = version_parts[1]
             if num_parts > 2:
                 content_type = version_parts[2]
-            retval = self._get_version(type, version_num, content_type) 
-        elif isinstance(version, BaseVersion):
+            retval = self._get_version(type, version_num, content_type)
+        elif isinstance(version, RSpecVersion):
             retval = version
+        elif not version:
+            retval = self.versions[0]
         else:
-            raise UnsupportedRSpecVersion("No such version: %s "% str(version))
- 
+            raise UnsupportedRSpecVersion(
+                "No such version: %s " % str(version))
+
         return retval
 
     def get_version_by_schema(self, schema):
@@ -69,11 +85,23 @@ class VersionManager:
             raise InvalidRSpec("Unkwnown RSpec schema: %s" % schema)
         return retval
 
-if __name__ == '__main__':
-    v = VersionManager()
-    print v.versions
-    print v.get_version('sfa 1') 
-    print v.get_version('protogeni 2') 
-    print v.get_version('protogeni 2 advertisement') 
-    print v.get_version_by_schema('http://www.protogeni.net/resources/rspec/2/ad.xsd') 
+    def show_by_string(self, string):
+        try:
+            print(self.get_version(string))
+        except Exception as e:
+            print(e)
 
+    def show_by_schema(self, string):
+        try:
+            print(self.get_version_by_schema(string))
+        except Exception as e:
+            print(e)
+
+if __name__ == '__main__':
+    manager = VersionManager()
+    print(manager)
+    manager.show_by_string('sfa 1')
+    manager.show_by_string('protogeni 2')
+    manager.show_by_string('protogeni 2 advertisement')
+    manager.show_by_schema('http://www.protogeni.net/resources/rspec/2/ad.xsd')
+    manager.show_by_schema('http://sorch.netmode.ntua.gr/ws/RSpec/ad.xsd')