-

cool-RR · cool-RR · commit 40a0b98073e9 · 2014-10-16T20:55:45.000+03:00
diff --git a/source_py3/python_toolbox/combi/perming/perm_space.py b/source_py3/python_toolbox/combi/perming/perm_space.py
@@ -634,7 +634,7 @@ def __getitem__(self, i):
                     raise RuntimeError
             assert wip_i == 0
             return self.perm_type(
-                dict_tools.get_list(wip_perm_sequence_dict, self.domain),
+                dict_tools.get_tuple(wip_perm_sequence_dict, self.domain),
                 self
             )
         
diff --git a/source_py3/python_toolbox/dict_tools.py b/source_py3/python_toolbox/dict_tools.py
@@ -45,9 +45,9 @@ def filter_items(d, condition, double=False, force_dict_type=None):
         )
 
 
-def get_list(d, iterable):
-    '''Get a list of values corresponding to an `iterable` of keys.'''
-    return [d[key] for key in iterable]
+def get_tuple(d, iterable):
+    '''Get a tuple of values corresponding to an `iterable` of keys.'''
+    return tuple(d[key] for key in iterable)
 
 
 def get_contained(d, container):
@@ -192,6 +192,9 @@ def remove_keys(d, keys_to_remove):
             
             
 def get_sorted_values(d, key=None):
+    '''
+    Get the values of dict `d` as a `tuple` sorted by their respective keys.
+    '''
     kwargs = {'key': key,} if key is not None else {}
-    return get_list(d, sorted(d.keys(), **kwargs))
+    return get_tuple(d, sorted(d.keys(), **kwargs))
     
diff --git a/source_py3/test_python_toolbox/test_dict_tools/test_get_sorted_values.py b/source_py3/test_python_toolbox/test_dict_tools/test_get_sorted_values.py
@@ -0,0 +1,11 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+from python_toolbox import dict_tools
+
+
+def test():
+    d = {1: 'a', 2: 'd', 3: 'j', 4: 'b',}
+    assert dict_tools.get_sorted_values(d) == ('a', 'd', 'j', 'b')
+    assert dict_tools.get_sorted_values(d, key=lambda x: -x) == \
+                                                           ('b', 'j', 'd', 'a')

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ def __getitem__(self, i):`
`634`	`634`	`raise RuntimeError`
`635`	`635`	`assert wip_i == 0`
`636`	`636`	`return self.perm_type(`
`637`		`- dict_tools.get_list(wip_perm_sequence_dict, self.domain),`
	`637`	`+ dict_tools.get_tuple(wip_perm_sequence_dict, self.domain),`
`638`	`638`	`self`
`639`	`639`	`)`
`640`	`640`