reviewed imports and pylint'ed

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

diff --git a/sfa/rspecs/rspec_version.py b/sfa/rspecs/rspec_version.py
old mode 100755 (executable)
new mode 100644 (file)
index b96a765..8e311b7
--- a/sfa/rspecs/rspec_version.py
+++ b/sfa/rspecs/rspec_version.py
@@ -1,42 +1,30 @@
 #!/usr/bin/python
-from sfa.util.sfalogging import _SfaLogger
+from sfa.util.sfalogging import logger
 
-class RSpecVersion(dict):
+class BaseVersion:
+    type = None
+    content_type = None
+    version = None
+    schema = None
+    namespace = None
+    extensions = {}
+    namespaces = dict(extensions.items() + [('default', namespace)])
+    elements = []
+    enabled = False
 
-    fields = {'type': None,
-              'version': None,
-              'schema': None,
-              'namespace': None,
-              'extensions': []
-        }
-    def __init__(self, version={}):
-        
-        self.logger = _SfaLogger('/var/log/sfa.log')
-        dict.__init__(self, self.fields)
-
-        if not version:
-            from sfa.rspecs.sfa_rspec import sfa_rspec_version
-            self.update(sfa_rspec_version)          
-        elif isinstance(version, dict):
-            self.update(version)
-        elif isinstance(version, basestring):
-            version_parts = version.split(' ')
-            num_parts = len(version_parts)
-            self['type'] = version_parts[0]
-            if num_parts > 1:
-                self['version'] = version_parts[1]
-        else:
-            logger.info("Unable to parse rspec version, using default")
+    def __init__(self, xml=None):
+        self.xml = xml
 
-    def get_version_name(self):
-        return "%s %s" % (str(self['type']), str(self['version']))
-
-if __name__ == '__main__':
+    def to_dict(self):
+        return {
+            'type': self.type,
+            'version': self.version,
+            'schema': self.schema,
+            'namespace': self.namespace,
+            'extensions': self.extensions
+        }
 
-    from sfa.rspecs.pl_rspec_version import ad_rspec_versions
-    for version in [RSpecVersion(), 
-                    RSpecVersion("SFA"), 
-                    RSpecVersion("SFA 1"),
-                    RSpecVersion(ad_rspec_versions[0])]: 
-        print version.get_version_name() + ": " + str(version)
+    def to_string(self):
+        return "%s %s" % (self.type, self.version)
+