anna/emmental
anna
/
emmental
1
0
Fork 0
Code Issues 13 Pull Requests Projects 1 Releases 12 Wiki Activity

curds: Rename node next and prev 

This avoids a conflict with the Playlist class next() function

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2019-04-16 13:51:06 -04:00
parent 3f7a68a37a
commit 3a89ff8885
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
curds/playlist/node.py
View File

@ -2,20 +2,20 @@
class PlaylistNode:
def __init__(self, name="", icon=""):
self.children = [ ]
self.icon = icon
self.name = self.__normalize__(name)
self.next = None
self.parent = None
self.prev = None
self.children = [ ]
self.icon = icon
self.name = self.__normalize__(name)
self.next_child = None
self.parent = None
self.prev_child = None
def __link_children__(self, b, c):
if c.prev:
c.prev.next = b
if c.prev_child:
c.prev_child.next_child = b
if b:
b.prev = c.prev
b.next = c
c.prev = b
b.prev_child = c.prev_child
b.next_child = c
c.prev_child = b
def __lt__(self, rhs):
return self.name < rhs.name

28
curds/playlist/test_node.py
View File

@ -8,8 +8,8 @@ class TestPlaylistNode(unittest.TestCase):
self.assertEqual( n.children, [ ])
self.assertEqual( n.icon, "")
self.assertEqual( n.name, "")
self.assertIsNone(n.next)
self.assertIsNone(n.prev)
self.assertIsNone(n.next_child)
self.assertIsNone(n.prev_child)
n = node.PlaylistNode("test node", "test-icon")
self.assertEqual(n.icon, "test-icon")
@ -37,14 +37,14 @@ class TestPlaylistNode(unittest.TestCase):
self.assertEqual(root.append_child(a), 1)
self.assertEqual(root.n_children(), 2)
self.assertEqual(root.children, [ b, a ])
self.assertEqual(b.next, a)
self.assertEqual(a.prev, b)
self.assertEqual(b.next_child, a)
self.assertEqual(a.prev_child, b)
self.assertEqual(root.append_child(c), 2)
self.assertEqual(root.n_children(), 3)
self.assertEqual(root.children, [ b, a, c ])
self.assertEqual(a.next, c)
self.assertEqual(c.prev, a)
self.assertEqual(a.next_child, c)
self.assertEqual(c.prev_child, a)
def test_node_index(self):
root = node.PlaylistNode()
@ -76,22 +76,22 @@ class TestPlaylistNode(unittest.TestCase):
self.assertEqual(root.insert_child(d), 1)
self.assertEqual(root.n_children(), 2)
self.assertEqual(root.children, [ b, d ])
self.assertEqual(b.next, d)
self.assertEqual(d.prev, b)
self.assertEqual(b.next_child, d)
self.assertEqual(d.prev_child, b)
self.assertEqual(root.insert_child(c), 1)
self.assertEqual(root.n_children(), 3)
self.assertEqual(root.children, [ b, c, d ])
self.assertEqual(b.next, c)
self.assertEqual(c.prev, b)
self.assertEqual(c.next, d)
self.assertEqual(d.prev, c)
self.assertEqual(b.next_child, c)
self.assertEqual(c.prev_child, b)
self.assertEqual(c.next_child, d)
self.assertEqual(d.prev_child, c)
self.assertEqual(root.insert_child(a), 0)
self.assertEqual(root.n_children(), 4)
self.assertEqual(root.children, [ a, b, c, d ])
self.assertEqual(a.next, b)
self.assertEqual(b.prev, a)
self.assertEqual(a.next_child, b)
self.assertEqual(b.prev_child, a)
def test_node_lookup(self):
root = node.PlaylistNode()