-

cool-RR · cool-RR · commit 430dd842ed48 · 2014-05-01T02:54:58.000+03:00
diff --git a/source_py2/python_toolbox/misc_tools/misc_tools.py b/source_py2/python_toolbox/misc_tools/misc_tools.py
@@ -358,7 +358,7 @@ def decimal_number_from_string(string):
     '''
     if isinstance(string, bytes):
         string = string.decode()
-    if not isinstance(string, str):
+    if not isinstance(string, basestring):
         raise Exception("%s isn't a decimal number." % string)
     if not _decimal_number_pattern.match(string):
         raise Exception("%s isn't a decimal number." % string)
diff --git a/source_py2/python_toolbox/nifty_collections/ordered_dict.py b/source_py2/python_toolbox/nifty_collections/ordered_dict.py
@@ -14,6 +14,29 @@
 
 class OrderedDict(StdlibOrderedDict):
     
+    def move_to_end(self, key, last=True):
+        '''Move an existing element to the end (or beginning if last==False).
+
+        Raises KeyError if the element does not exist.
+        When last=True, acts like a fast version of self[key]=self.pop(key).
+
+        '''
+        link = self.__map[key]
+        link_prev = link[0]
+        link_next = link[1]
+        link_prev[1] = link_next
+        link_next[0] = link_prev
+        if last:
+            last = self.__root[0]
+            link[0] = last
+            link[1] = self.__root
+            last[1] = self.__root[0] = link
+        else:
+            first = self.__root[1]
+            link[0] = self.__root
+            link[1] = first
+            root[1] = first[0] = link
+
     def sort(self, key=None, reverse=False):
         '''
         Sort the items according to their keys, changing the order in-place.
