fixes #9

python3 support

Author: uralbash

.gitignore

@@ -18,3 +18,5 @@ TODO
 TODO.txt
 nohup.out
 .cache
+.tox
+__pycache__

sqlalchemy_mptt/__init__.py

@@ -5,7 +5,7 @@
 # Copyright © 2014 uralbash <root@uralbash.ru>
 #
 # Distributed under terms of the MIT license.
-from mixins import BaseNestedSets
+from .mixins import BaseNestedSets
 
 __version__ = "0.0.1"
 __mixins__ = [BaseNestedSets]

sqlalchemy_mptt/events.py

@@ -173,7 +173,7 @@ def mptt_before_update(mapper, connection, instance):
                     table.c.tree_id == instance.tree_id))
         .order_by(table.c.lft)
     ).fetchall()
-    subtree = map(lambda x: x[0], subtree)
+    subtree = [x[0] for x in subtree]
 
     """ step 0: Initialize parameters.
 

sqlalchemy_mptt/mixins.py

@@ -15,7 +15,7 @@
 from sqlalchemy.orm import backref, relationship
 from sqlalchemy.orm.session import Session
 
-from events import mptt_before_delete, mptt_before_insert, mptt_before_update
+from .events import mptt_before_delete, mptt_before_insert, mptt_before_update
 
 
 class BaseNestedSets(object):

sqlalchemy_mptt/tests.py

@@ -15,7 +15,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
-from mixins import BaseNestedSets
+from .mixins import BaseNestedSets
 
 Base = declarative_base()
 
@@ -106,6 +106,10 @@ def add_mptt_tree(session):
     add_fixture(Tree, tree2, session)
 
 
+def get_obj(session, id):
+    return session.query(Tree).filter_by(id=id).one()
+
+
 class TestTree(unittest.TestCase):
 
     def setUp(self):
@@ -1029,8 +1033,11 @@ def test_move_after_between_tree(self):
 
     def test_get_tree(self):
         tree = Tree.get_tree(self.session)
-        self.assertEqual(str(tree),
-                         "[{'node': <Node (1)>, 'children': [{'node': <Node (2)>, 'children': [{'node': <Node (3)>}]}, {'node': <Node (4)>, 'children': [{'node': <Node (5)>}, {'node': <Node (6)>}]}, {'node': <Node (7)>, 'children': [{'node': <Node (8)>, 'children': [{'node': <Node (9)>}]}, {'node': <Node (10)>, 'children': [{'node': <Node (11)>}]}]}]}, {'node': <Node (12)>, 'children': [{'node': <Node (13)>, 'children': [{'node': <Node (14)>}]}, {'node': <Node (15)>, 'children': [{'node': <Node (16)>}, {'node': <Node (17)>}]}, {'node': <Node (18)>, 'children': [{'node': <Node (19)>, 'children': [{'node': <Node (20)>}]}, {'node': <Node (21)>, 'children': [{'node': <Node (22)>}]}]}]}]")
+
+        def go(id):
+            return get_obj(self.session, id)
+        self.assertEqual(tree,
+                         [{'node': go(1), 'children': [{'node': go(2), 'children': [{'node': go(3)}]}, {'node': go(4), 'children': [{'node': go(5)}, {'node': go(6)}]}, {'node': go(7), 'children': [{'node': go(8), 'children': [{'node': go(9)}]}, {'node': go(10), 'children': [{'node': go(11)}]}]}]}, {'node': go(12), 'children': [{'node': go(13), 'children': [{'node': go(14)}]}, {'node': go(15), 'children': [{'node': go(16)}, {'node': go(17)}]}, {'node': go(18), 'children': [{'node': go(19), 'children': [{'node': go(20)}]}, {'node': go(21), 'children': [{'node': go(22)}]}]}]}])
 
     def test_get_json_tree(self):
         tree = Tree.get_tree(self.session, json=True)

tox.ini

@@ -0,0 +1,8 @@
+# content of: tox.ini , put in same dir as setup.py
+[tox]
+envlist = py27,py33
+[testenv]
+deps=
+    -rrequirements.txt
+    nose
+commands=nosetests