diff --git a/rhodecode/api/utils.py b/rhodecode/api/utils.py
--- a/rhodecode/api/utils.py
+++ b/rhodecode/api/utils.py
@@ -214,7 +214,7 @@ def get_user_or_error(userid):
     from rhodecode.model.user import UserModel
     user_model = UserModel()
 
-    if isinstance(userid, (int, long)):
+    if isinstance(userid, int):
         try:
             user = user_model.get_user(userid)
         except ValueError:
@@ -237,7 +237,7 @@ def get_repo_or_error(repoid):
     from rhodecode.model.repo import RepoModel
     repo_model = RepoModel()
 
-    if isinstance(repoid, (int, long)):
+    if isinstance(repoid, int):
         try:
             repo = repo_model.get_repo(repoid)
         except ValueError:
@@ -260,7 +260,7 @@ def get_repo_group_or_error(repogroupid)
     from rhodecode.model.repo_group import RepoGroupModel
     repo_group_model = RepoGroupModel()
 
-    if isinstance(repogroupid, (int, long)):
+    if isinstance(repogroupid, int):
         try:
             repo_group = repo_group_model._get_repo_group(repogroupid)
         except ValueError:
@@ -283,7 +283,7 @@ def get_user_group_or_error(usergroupid)
     from rhodecode.model.user_group import UserGroupModel
     user_group_model = UserGroupModel()
 
-    if isinstance(usergroupid, (int, long)):
+    if isinstance(usergroupid, int):
         try:
             user_group = user_group_model.get_group(usergroupid)
         except ValueError:
diff --git a/rhodecode/authentication/base.py b/rhodecode/authentication/base.py
--- a/rhodecode/authentication/base.py
+++ b/rhodecode/authentication/base.py
@@ -472,7 +472,7 @@ class RhodeCodeAuthPluginBase(object):
         from rhodecode.authentication import plugin_default_auth_ttl
         cache_ttl = plugin_default_auth_ttl
 
-        if isinstance(self.AUTH_CACHE_TTL, (int, long)):
+        if isinstance(self.AUTH_CACHE_TTL, int):
             # plugin cache set inside is more important than the settings value
             cache_ttl = self.AUTH_CACHE_TTL
         elif plugin_settings.get('cache_ttl'):
diff --git a/rhodecode/lib/_vendor/authomatic/six.py b/rhodecode/lib/_vendor/authomatic/six.py
--- a/rhodecode/lib/_vendor/authomatic/six.py
+++ b/rhodecode/lib/_vendor/authomatic/six.py
@@ -47,7 +47,7 @@ if PY3:
     MAXSIZE = sys.maxsize
 else:
     string_types = str,
-    integer_types = (int, long)
+    integer_types = int
     class_types = (type, types.ClassType)
     text_type = unicode
     binary_type = str
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
@@ -1741,7 +1741,7 @@ class Repository(Base, BaseModel):
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
-        if isinstance(repoid, (int, long)):
+        if isinstance(repoid, int):
             try:
                 repo = cls.get(repoid)
             except ValueError:
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py
@@ -1757,7 +1757,7 @@ class Repository(Base, BaseModel):
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
-        if isinstance(repoid, (int, long)):
+        if isinstance(repoid, int):
             try:
                 repo = cls.get(repoid)
             except ValueError:
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py
@@ -1770,7 +1770,7 @@ class Repository(Base, BaseModel):
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
-        if isinstance(repoid, (int, long)):
+        if isinstance(repoid, int):
             try:
                 repo = cls.get(repoid)
             except ValueError:
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py b/rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py
@@ -1770,7 +1770,7 @@ class Repository(Base, BaseModel):
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
-        if isinstance(repoid, (int, long)):
+        if isinstance(repoid, int):
             try:
                 repo = cls.get(repoid)
             except ValueError:
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
@@ -1790,7 +1790,7 @@ class Repository(Base, BaseModel):
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
-        if isinstance(repoid, (int, long)):
+        if isinstance(repoid, int):
             try:
                 repo = cls.get(repoid)
             except ValueError:
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
@@ -1848,7 +1848,7 @@ class Repository(Base, BaseModel):
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
-        if isinstance(repoid, (int, long)):
+        if isinstance(repoid, int):
             try:
                 repo = cls.get(repoid)
             except ValueError:
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py b/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
@@ -1854,7 +1854,7 @@ class Repository(Base, BaseModel):
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
-        if isinstance(repoid, (int, long)):
+        if isinstance(repoid, int):
             try:
                 repo = cls.get(repoid)
             except ValueError:
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
@@ -1885,7 +1885,7 @@ class Repository(Base, BaseModel):
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
-        if isinstance(repoid, (int, long)):
+        if isinstance(repoid, int):
             try:
                 repo = cls.get(repoid)
             except ValueError:
diff --git a/rhodecode/lib/ext_json.py b/rhodecode/lib/ext_json.py
--- a/rhodecode/lib/ext_json.py
+++ b/rhodecode/lib/ext_json.py
@@ -28,7 +28,7 @@ def _obj_dump(obj):
         return list(obj)
     elif isinstance(obj, datetime.datetime):
         r = obj.isoformat()
-        if isinstance(obj.microsecond, (int, long)):
+        if isinstance(obj.microsecond, int):
             r = r[:23] + r[26:]
         if r.endswith('+00:00'):
             r = r[:-6] + 'Z'
@@ -39,7 +39,7 @@ def _obj_dump(obj):
         if is_aware(obj):
             raise TypeError("Time-zone aware times are not JSON serializable")
         r = obj.isoformat()
-        if isinstance(obj.microsecond, (int, long)):
+        if isinstance(obj.microsecond, int):
             r = r[:12]
         return r
     elif hasattr(obj, '__json__'):
diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -788,7 +788,7 @@ class BaseRepository(object):
             raise TypeError("commit_id must be a string value got {} instead".format(type(commit_id)))
 
     def _validate_commit_idx(self, commit_idx):
-        if not isinstance(commit_idx, (int, long)):
+        if not isinstance(commit_idx, int):
             raise TypeError("commit_idx must be a numeric value")
 
     def _validate_branch_name(self, branch_name):
diff --git a/rhodecode/model/__init__.py b/rhodecode/model/__init__.py
--- a/rhodecode/model/__init__.py
+++ b/rhodecode/model/__init__.py
@@ -76,7 +76,7 @@ class BaseModel(object):
 
         if isinstance(instance, cls):
             return instance
-        elif isinstance(instance, (int, long)):
+        elif isinstance(instance, int):
             if isinstance(cls, tuple):
                 # if we pass multi instances we pick first to .get()
                 cls = cls[0]
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -523,7 +523,7 @@ class CommentsModel(BaseModel):
         # would return 3 here
         comment_version = ChangesetCommentHistory.get_version(comment_id)
 
-        if isinstance(version, (int, long)) and (comment_version - version) != 1:
+        if isinstance(version, int) and (comment_version - version) != 1:
             log.warning(
                 'Version mismatch comment_version {} submitted {}, skipping'.format(
                     comment_version-1,  # -1 since note above
diff --git a/rhodecode/model/integration.py b/rhodecode/model/integration.py
--- a/rhodecode/model/integration.py
+++ b/rhodecode/model/integration.py
@@ -46,11 +46,11 @@ class IntegrationModel(BaseModel):
     def __get_integration(self, integration):
         if isinstance(integration, Integration):
             return integration
-        elif isinstance(integration, (int, long)):
+        elif isinstance(integration, int):
             return self.sa.query(Integration).get(integration)
         else:
             if integration:
-                raise Exception('integration must be int, long or Instance'
+                raise Exception('integration must be int or Instance'
                                 ' of Integration got %s' % type(integration))
 
     def create(self, IntegrationType, name, enabled, repo, repo_group,
diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py
--- a/rhodecode/model/notification.py
+++ b/rhodecode/model/notification.py
@@ -47,11 +47,11 @@ class NotificationModel(BaseModel):
     def __get_notification(self, notification):
         if isinstance(notification, Notification):
             return notification
-        elif isinstance(notification, (int, long)):
+        elif isinstance(notification, int):
             return Notification.get(notification)
         else:
             if notification:
-                raise Exception('notification must be int, long or Instance'
+                raise Exception('notification must be int or Instance'
                                 ' of Notification got %s' % type(notification))
 
     def create(