diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-07-23 09:48:45 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-07-23 09:48:45 +0200 |
| commit | 945af57802caa299ae1568e30cdaa655c527e5fe (patch) | |
| tree | f1aa039bdfa20ebab6d869e637bb0e6f480557bb | |
| parent | ec1f0319f7ad15bc0bb6d1c72750d56fd5e8de5b (diff) | |
| parent | 56ae5a1503fc9503bdf4a9902709f84fd3d6e99b (diff) | |
| download | rumba-945af57802caa299ae1568e30cdaa655c527e5fe.tar.gz rumba-945af57802caa299ae1568e30cdaa655c527e5fe.zip | |
Merge branch 'master' into testing
| -rw-r--r-- | rumba/prototypes/irati_templates.py | 2 | ||||
| -rw-r--r-- | rumba/storyboard.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rumba/prototypes/irati_templates.py b/rumba/prototypes/irati_templates.py index 6e5932d..a6dd3c4 100644 --- a/rumba/prototypes/irati_templates.py +++ b/rumba/prototypes/irati_templates.py @@ -369,7 +369,7 @@ policy_translator = { 'routing': lambda d, v, p: ps_set( d["routingConfiguration"], "policySet", v, p), 'resource-allocator.pduftg': lambda d, v, p: ps_set( - d["resourceAllocatorConfiguration"], "policySet", v, p), + d["resourceAllocatorConfiguration"]["pduftgConfiguration"], "policySet", v, p), 'efcp.*.dtcp': None, 'efcp.*.dtp': None, } diff --git a/rumba/storyboard.py b/rumba/storyboard.py index f03a2e8..200cca7 100644 --- a/rumba/storyboard.py +++ b/rumba/storyboard.py @@ -45,7 +45,7 @@ import rumba.log as log try: from io import StringIO except ImportError: - import StringIO # Python 2 here + from StringIO import StringIO # Python 2 here logger = log.get_logger(__name__) @@ -1221,7 +1221,7 @@ class StoryBoard(_SBEntity): """ s = StringIO() self.write_script(s) - return s + return s.getvalue() def parse_script(self, buffer, clean=True): """ |