Merge pull request #154 from caesar0301/dev

#128 Merge v1.6.1

Author: leonardbinet

.gitignore

@@ -1,5 +1,6 @@
 *.py[cod]
 .idea
+env/*
 .python-version
 
 # C extensions

HISTORY

@@ -1,3 +1,6 @@
+Oct 13 2019 V1.5.6
+Add ability to independently mutate multiple shallow copies of same initial tree.
+
 Mar 27, 2014 V1.2.6
 Node identifier supports multiple data types beyond int and str.
 Finish depth() and leaves() routines.

setup.py

@@ -13,6 +13,7 @@
     license="Apache License, Version 2.0",
     packages=['treelib'],
     keywords=['data structure', 'tree', 'tools'],
+    install_requires=["future"],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',

tests/test_node.py

@@ -1,5 +1,6 @@
 import unittest
 
+from collections import defaultdict
 from treelib import Node
 
 
@@ -11,9 +12,13 @@ def setUp(self):
     def test_initialization(self):
         self.assertEqual(self.node1.tag, "Test One")
         self.assertEqual(self.node1.identifier, "identifier 1")
-        self.assertEqual(self.node1.expanded, True)
+        # retro-compatibility
         self.assertEqual(self.node1.bpointer, None)
         self.assertEqual(self.node1.fpointer, [])
+
+        self.assertEqual(self.node1.expanded, True)
+        self.assertEqual(self.node1._predecessor, {})
+        self.assertEqual(self.node1._successors, defaultdict(list))
         self.assertEqual(self.node1.data, None)
 
     def test_set_tag(self):
@@ -32,21 +37,45 @@ def test_set_identifier(self):
         self.node1.identifier = "identifier 1"
 
     def test_set_fpointer(self):
+        # retro-compatibility
         self.node1.update_fpointer("identifier 2")
         self.assertEqual(self.node1.fpointer, ['identifier 2'])
         self.node1.fpointer = []
+        self.assertEqual(self.node1.fpointer, [])
+
+    def test_update_successors(self):
+        self.node1.update_successors("identifier 2", tree_id="tree 1")
+        self.assertEqual(self.node1.successors("tree 1"), ['identifier 2'])
+        self.assertEqual(self.node1._successors["tree 1"], ['identifier 2'])
+        self.node1.set_successors([], tree_id="tree 1")
+        self.assertEqual(self.node1._successors["tree 1"], [])
 
     def test_set_bpointer(self):
+        # retro-compatibility
         self.node2.update_bpointer("identifier 1")
         self.assertEqual(self.node2.bpointer, 'identifier 1')
         self.node2.bpointer = None
+        self.assertEqual(self.node2.bpointer, None)
+
+    def test_set_predecessor(self):
+        self.node2.set_predecessor("identifier 1", "tree 1")
+        self.assertEqual(self.node2.predecessor("tree 1"), 'identifier 1')
+        self.assertEqual(self.node2._predecessor["tree 1"], 'identifier 1')
+        self.node2.set_predecessor(None, "tree 1")
+        self.assertEqual(self.node2.predecessor("tree 1"), None)
 
     def test_set_is_leaf(self):
         self.node1.update_fpointer("identifier 2")
         self.node2.update_bpointer("identifier 1")
         self.assertEqual(self.node1.is_leaf(), False)
         self.assertEqual(self.node2.is_leaf(), True)
 
+    def test_tree_wise_is_leaf(self):
+        self.node1.update_successors("identifier 2", tree_id="tree 1")
+        self.node2.set_predecessor("identifier 1", "tree 1")
+        self.assertEqual(self.node1.is_leaf("tree 1"), False)
+        self.assertEqual(self.node2.is_leaf("tree 1"), True)
+
     def test_data(self):
 
         class Flower(object):

tests/test_plugins.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import unittest
-
+import codecs
 import os
+import unittest
 
 from treelib import Tree
 from treelib.plugins import *