Do eval to store "normalized" dict

collective · Nov 13, 2015 · 61473c3 · 61473c3
1 parent b0c7094
commit 61473c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/dexterity/localroles/browser/settings.py b/src/dexterity/localroles/browser/settings.py
@@ -186,7 +186,7 @@ def convert_to_dict(value):
         value_dict = {}
         for row in value:
             state, roles, principal = row['state'], row['roles'], row['value']
-            related = row['related'] is not None and row['related'].strip() or ''
+            related = row['related'] is not None and row['related'].strip() and str(eval(row['related'])) or ''
             if state not in value_dict:
                 value_dict[state] = {}
             value_dict[state][principal] = {'roles': roles, 'rel': related}

diff --git a/src/dexterity/localroles/browser/tests/test_settings.py b/src/dexterity/localroles/browser/tests/test_settings.py
@@ -71,5 +71,5 @@ def __init__(self, fti):
         dict_values = {'private': {'raptor': {'roles': ('Reader', 'Contributor'), 'rel': ''},
                                    'caveman': {'roles': ('Reader', ), 'rel': ''}},
                        'pending': {'caveman': {'roles': ('Contributor', ), 'rel': ''}}}
-        self.assertEqual(dict_values, cls.convert_to_dict(values))
+        self.assertDictEqual(dict_values, cls.convert_to_dict(values))
         self.assertItemsEqual(values, cls.convert_to_list(dict_values))