# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation;
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
log.debug("Package sfa-common not installed.\
Could not import sfa.rspecs.rspec and sfa.util.xrn")
-from types import StringTypes, ListType
-
-
class SfaRSpecProcessing(object):
"""
Class to process SFA RSpecs, parse the RSpec replies such as Advertisement RSpecs,
self.config = config
def make_dict_rec(self, obj):
- if not obj or isinstance(obj, (StringTypes, bool)):
+ if not obj or isinstance(obj, (str, bool)):
return obj
if isinstance(obj, list):
objcopy = []
return objcopy
# We thus suppose we have a child of dict
objcopy = {}
- for k, v in obj.items():
+ for k, v in list(obj.items()):
objcopy[k] = self.make_dict_rec(v)
return objcopy
try:
nodes = rspec.version.get_nodes()
- except Exception, e:
+ except Exception as e:
self._log.warn("Could not retrieve nodes in RSpec: %s" % e)
try:
leases = rspec.version.get_leases()
- except Exception, e:
+ except Exception as e:
self._log.warn("Could not retrieve leases in RSpec: %s" % e)
try:
links = rspec.version.get_links()
- except Exception, e:
+ except Exception as e:
self._log.warn("Could not retrieve links in RSpec: %s" % e)
try:
channels = rspec.version.get_channels()
- except Exception, e:
+ except Exception as e:
self._log.warn("Could not retrieve channels in RSpec: %s" % e)
resources = []
elif resource_type == 'channel':
channels.append(resource)
else:
- raise Exception, "Not supported type of resource"
+ raise Exception("Not supported type of resource")
rspec.version.add_nodes(nodes, rspec_content_type="request")
#rspec.version.add_leases(leases)