X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversion_manager.py;h=b4daf4244c476ca177f31462b48a61741154cce3;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=cedd54f1b918bad1441e26820c07e7fee368c70d;hpb=fad16c7d54b658b37a9b42fbee47b0d4f51cb8ec;p=sfa.git

diff --git a/sfa/rspecs/version_manager.py b/sfa/rspecs/version_manager.py
index cedd54f1..b4daf424 100644
--- a/sfa/rspecs/version_manager.py
+++ b/sfa/rspecs/version_manager.py
@@ -1,11 +1,14 @@
-from __future__ import print_function
+
 
 import os
 from sfa.util.faults import InvalidRSpec, UnsupportedRSpecVersion
-from sfa.rspecs.version import RSpecVersion 
-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()
@@ -13,18 +16,18 @@ class VersionManager:
     def __repr__(self):
         return "<VersionManager with {} flavours: [{}]>"\
             .format(len(self.versions),
-                    ", ".join( [ str(x) for x in 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 x.endswith('.py') and x !=  '__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)
@@ -37,20 +40,23 @@ class VersionManager:
             if type is None or type.lower() == version.type.lower():
                 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 UnsupportedRSpecVersion("[%s %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
@@ -59,14 +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) 
+            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):
@@ -93,9 +100,8 @@ class VersionManager:
 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_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')
-