X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fapi_versions.py;h=6e584922bf203bbfa0e7c799df9bd625aeb4e032;hb=0ce89bde3d8e9b22f8949c90b6ca37a81acf4b06;hp=9b05dbe27532f68f84bad4e779e877529f0eca08;hpb=a979334e9bb65b34f67d1bc0ca2003c184de9924;p=sfa.git diff --git a/sfa/server/api_versions.py b/sfa/server/api_versions.py index 9b05dbe2..6e584922 100644 --- a/sfa/server/api_versions.py +++ b/sfa/server/api_versions.py @@ -2,13 +2,14 @@ import os from sfa.util.xml import XML from sfa.util.config import Config + class ApiVersions: required_fields = ['version', 'url'] - + template = """ -""" +""" def __init__(self, string=None, filename=None, create=False): self.xml = None @@ -22,9 +23,10 @@ class ApiVersions: else: # load the default file c = Config() - api_versions_file = os.path.sep.join([c.config_path, 'api_versions.xml']) + api_versions_file = os.path.sep.join( + [c.config_path, 'api_versions.xml']) self.load(api_versions_file) - + def create(self): self.xml = XML(string=ApiVersions.template) @@ -39,8 +41,7 @@ class ApiVersions: if isinstance(value, list): for item in value: if isinstance(item, dict) and \ - set(ApiVersions.required_fields).issubset(item.keys()): + set(ApiVersions.required_fields).issubset(item.keys()) and \ + item['version'] != '' and item['url'] != '': versions[str(item['version'])] = item['url'] - return versions - - + return versions