Added python3 support

.gitignore

@@ -1,4 +1,5 @@
 *.egg-info
 dist
 cover
-.coverage
+.coverage
+*.pyc

.travis.yml

@@ -1,6 +1,8 @@
 language: python
-python: "2.7"
+python:
+    - "2.7"
+    - "3.5"
 install:
-    - pip install -r requirements.txt --allow-external twill --allow-unverified twill
-    - pip install coverage nose lxml requests cssselect
-script: nosetests --with-coverage --cover-package=flask_permissions
+    - pip install -r requirements.txt
+    - pip install -r requirements_test.txt
+script: nosetests --with-coverage --cover-package=flask_permissions

flask_permissions/models.py

@@ -114,20 +114,21 @@ def _id_column_name(self):
         # the list of the class's columns (with attributes like
         # 'primary_key', etc.) is accessible in different places
         # before and after table definition.
-        if self.__tablename__ in self.metadata.tables.keys():
+        if self.__tablename__ in list(self.metadata.tables.keys()):
             # after definition, it's here
             columns = self.metadata.tables[self.__tablename__]._columns
         else:
             # before, it's here
             columns = self.__dict__
 
-        for k, v in columns.items():
+        for k, v in list(columns.items()):
             if getattr(v, 'primary_key', False):
                 return k
 
     @declared_attr
     def _roles(self):
-        user_role_table = make_user_role_table(self.__tablename__, self._id_column_name)
+        user_role_table = make_user_role_table(self.__tablename__,
+                                               self._id_column_name.fget(self))
         return db.relationship(
             'Role', secondary=user_role_table, backref='users')
 
@@ -138,7 +139,7 @@ def roles(self):
     def __init__(self, roles=None, default_role='user'):
         # If only a string is passed for roles, convert it to a list containing
         # that string
-        if roles and isinstance(roles, basestring):
+        if roles and isinstance(roles, str):
             roles = [roles]
 
         # If a sequence is passed for roles (or if roles has been converted to
@@ -167,7 +168,7 @@ def remove_roles(self, *roles):
         self.roles = [role for role in self.roles if role not in roles]
 
     def get_id(self):
-        return unicode(getattr(self, self._id_column_name))
+        return str(getattr(self, self._id_column_name))
 
     def __repr__(self):
-        return '<{} {}>'.format(self.__tablename__.capitalize(), self.get_id())
+        return '<{} {}>'.format(self.__tablename__.capitalize(), self.get_id())

flask_permissions/tests.py

@@ -15,6 +15,7 @@
 db_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'app.db')
 
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + db_path
+app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
 db = SQLAlchemy(app)
 
@@ -83,7 +84,7 @@ def test_user_get_id(self):
         user = User()
         db.session.add(user)
         db.session.commit()
-        self.assertEqual(user.get_id(), unicode(1))
+        self.assertEqual(user.get_id(), str(1))
 
     def test_user_repr(self):
         user = User()
@@ -126,7 +127,8 @@ def test_add_roles_with_nonexisting_roles(self):
         db.session.add(user)
         db.session.commit()
         test_user = User.query.get(1)
-        self.assertItemsEqual(new_roles, test_user.roles)
+        # self.assertItemsEqual(new_roles, test_user.roles)
+        self.assertEqual(sorted(new_roles), sorted(test_user.roles))
 
     def test_add_roles_with_existing_roles(self):
         user = User(default_role=None)
@@ -139,7 +141,8 @@ def test_add_roles_with_existing_roles(self):
         db.session.add(user)
         db.session.commit()
         test_user = User.query.get(1)
-        self.assertItemsEqual(new_roles, test_user.roles)
+        # self.assertItemsEqual(new_roles, test_user.roles)
+        self.assertEqual(sorted(new_roles), sorted(test_user.roles))
 
     def test_remove_roles(self):
         user = User()
@@ -152,7 +155,8 @@ def test_remove_roles(self):
         db.session.add(user)
         db.session.commit()
         test_user = User.query.get(1)
-        self.assertItemsEqual(test_user.roles, ['superadmin'])
+        # self.assertItemsEqual(test_user.roles, ['superadmin'])
+        self.assertEqual(sorted(test_user.roles), sorted(['superadmin']))
 
     def test_add_abilities_with_nonexisting_abilities(self):
         role = Role('admin')
@@ -162,7 +166,8 @@ def test_add_abilities_with_nonexisting_abilities(self):
         db.session.commit()
         test_role = Role.query.get(1)
         abilities = [ability.name for ability in test_role.abilities]
-        self.assertItemsEqual(new_abilities, abilities)
+        # self.assertItemsEqual(new_abilities, abilities)
+        self.assertEqual(sorted(new_abilities), sorted(abilities))
 
     def test_add_abilities_with_existing_abilities(self):
         role = Role('admin')
@@ -176,7 +181,8 @@ def test_add_abilities_with_existing_abilities(self):
         db.session.commit()
         test_role = Role.query.get(1)
         abilities = [ability.name for ability in test_role.abilities]
-        self.assertItemsEqual(new_abilities, abilities)
+        # self.assertItemsEqual(new_abilities, abilities)
+        self.assertEqual(sorted(new_abilities), sorted(abilities))
 
     def test_remove_abilities(self):
         role = Role('admin')
@@ -190,7 +196,8 @@ def test_remove_abilities(self):
         db.session.commit()
         test_role = Role.query.get(1)
         abilities = [ability.name for ability in test_role.abilities]
-        self.assertItemsEqual(abilities, ['create_users'])
+        # self.assertItemsEqual(abilities, ['create_users'])
+        self.assertEqual(sorted(abilities), sorted(['create_users']))
 
 
 class DecoratorsTests(DatabaseTests):
@@ -271,3 +278,7 @@ def test_is_tuple_a_sequence(self):
     def test_is_dict_a_sequence(self):
         dict_var = {'a': 1, 'b': 2, 'c': 3}
         self.assertTrue(is_sequence(dict_var))
+
+
+if __name__ == '__main__':  # optional, but makes import and reuse easier
+    unittest.main()

flask_permissions/utils.py

@@ -1,4 +1,4 @@
 def is_sequence(arg):
-    return (not hasattr(arg, "strip") and
-            hasattr(arg, "__getitem__") or
-            hasattr(arg, "__iter__"))
+    if hasattr(arg, "strip"):
+        return False
+    return (hasattr(arg, "__getitem__") or hasattr(arg, "__iter__"))

requirements.txt

@@ -1,5 +1,9 @@
-Flask==0.10.1
-Flask-Testing==0.4
-Flask-SQLAlchemy==1.0
-Werkzeug==0.9.4
-wsgiref==0.1.2
+click==6.7
+Flask==0.12.1
+Flask-SQLAlchemy==2.2
+itsdangerous==0.24
+Jinja2==2.9.6
+MarkupSafe==1.0
+SQLAlchemy==1.1.9
+Werkzeug==0.12.1
+

requirements_test.txt

@@ -0,0 +1,3 @@
+coverage==4.4
+Flask-Testing==0.6.2
+nose==1.3.7