Python 2 and 3 compatibility changes.

examples/repository.py

@@ -9,7 +9,7 @@
 repo = olite.repos.create('ydo')
 repo = olite.repos.get_or_create('second_repo')
 
-print "Repo's users: %s" % repo.users
+print("Repo's users: %s" % repo.users)
 
 user = olite.users.create(name='bob', key_path="~/.ssh/third_rsa.pub")
 

examples/users.py

@@ -21,7 +21,7 @@
 vlad.keys.remove("my awesome key")
 
 # check if user is admin or not
-print vlad.is_admin
+print(vlad.is_admin)
 
 # TODO:
 # vlad.repos['oxygen'].permissions = 'RW+'

pyolite/git.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import os
+from six import string_types
 
 from sh import git
 
@@ -11,7 +12,7 @@ def __init__(self, repo):
 
     def commit(self, objects, message):
         # validate commit message
-        if not message or not isinstance(message, str):
+        if not message or not isinstance(message, string_types):
             raise ValueError(
                 "Commit message should not be empty or not string")
 

pyolite/models/lists/users.py

@@ -77,7 +77,7 @@ def get_or_create(self, user):
     def set(self, users=None):
         users_serialized = "repo {}\n".format(self.repository_model.name)
         if isinstance(users, dict):
-            users = users.iteritems()
+            users = users.items()
 
         if users:
             for user, permission in users:

pyolite/models/user.py

@@ -1,3 +1,4 @@
+from six import string_types
 from unipath import Path
 
 from pyolite.models.lists import ListKeys
@@ -38,7 +39,7 @@ def get_by_name(cls, name, path, git):
 
     @classmethod
     def get(cls, user, path, git):
-        if isinstance(user, str):
+        if isinstance(user, string_types):
             user = User.get_by_name(user, path, git)
 
         if not isinstance(user, User) or not user: