From 0f06470c1190b1a4108324500530935061ee84e6 Mon Sep 17 00:00:00 2001
From: James Johnson <jjohnson@enthought.com>
Date: Thu, 14 Jun 2018 10:47:11 +0100
Subject: [PATCH] Renamed things from pop_traits to pop_traits_version
---
force_bdss/io/tests/test_workflow_writer.py | 8 ++++----
force_bdss/io/workflow_writer.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/force_bdss/io/tests/test_workflow_writer.py b/force_bdss/io/tests/test_workflow_writer.py
index 0513ade..b3641a6 100644
--- a/force_bdss/io/tests/test_workflow_writer.py
+++ b/force_bdss/io/tests/test_workflow_writer.py
@@ -14,7 +14,7 @@ from force_bdss.tests.dummy_classes.factory_registry_plugin import \
DummyFactoryRegistryPlugin
from force_bdss.io.workflow_writer import WorkflowWriter, traits_to_dict,\
- pop_traits
+ pop_traits_version
from force_bdss.core.workflow import Workflow
@@ -91,11 +91,11 @@ class TestWorkflowWriter(unittest.TestCase):
def test_pop_traits_version(self):
- test_dictionary = {'Entry1': {'Entry1-1': 4, '__traits_version__':67},
+ test_dictionary = {'Entry1': {'Entry1-1': 4, '__traits_version__': 67},
'Entry2': [3, 'a', {'Entry2-1': 5,
'__traits_version__': 9001}],
'__traits_version__': 13}
result_dictionary = {'Entry1': {'Entry1-1': 4, },
'Entry2': [3, 'a', {'Entry2-1': 5, }], }
- traitless_dictionary = pop_traits(test_dictionary)
- self.assertEqual(traitless_dictionary,result_dictionary)
+ traitless_dictionary = pop_traits_version(test_dictionary)
+ self.assertEqual(traitless_dictionary, result_dictionary)
diff --git a/force_bdss/io/workflow_writer.py b/force_bdss/io/workflow_writer.py
index 4a87951..404fcb2 100644
--- a/force_bdss/io/workflow_writer.py
+++ b/force_bdss/io/workflow_writer.py
@@ -111,12 +111,12 @@ def pop_traits_version(dictionary):
for key in dictionary:
# If we have a dict, remove the traits version
if isinstance(dictionary[key], dict):
- pop_traits(dictionary[key])
+ pop_traits_version(dictionary[key])
# If we have a non-dict which contains a dict, remove traits from
# that as well
elif isinstance(dictionary[key], Iterable):
for element in dictionary[key]:
if isinstance(element, dict):
- pop_traits(element)
+ pop_traits_version(element)
return dictionary
--
GitLab