Jelajahi Sumber

HUE-8737 [core] Futurize desktop/libs/libsentry for Python 3.5

Ying Chen 6 tahun lalu
induk
melakukan
3689b66a3d

+ 2 - 1
desktop/libs/libsentry/gen-py/sentry_common_service/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 # Autogenerated by Thrift Compiler (0.9.1)
 #
@@ -7,7 +8,7 @@
 #
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from sentry_common_service.ttypes import *
 
 TSENTRY_SERVICE_V1 = 1
 TSENTRY_STATUS_OK = 0

+ 2 - 1
desktop/libs/libsentry/gen-py/sentry_common_service/ttypes.py

@@ -6,6 +6,7 @@
 #  options string: py:new_style
 #
 
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 
 from thrift.transport import TTransport
@@ -95,7 +96,7 @@ class TSentryResponseStatus(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):

+ 27 - 25
desktop/libs/libsentry/gen-py/sentry_generic_policy_service/SentryGenericPolicyService.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 #
@@ -6,9 +7,10 @@
 #  options string: py:new_style
 #
 
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import logging
-from ttypes import *
+from sentry_generic_policy_service.ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol, TProtocol
@@ -804,7 +806,7 @@ class create_sentry_role_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -869,7 +871,7 @@ class create_sentry_role_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -935,7 +937,7 @@ class drop_sentry_role_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1000,7 +1002,7 @@ class drop_sentry_role_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1066,7 +1068,7 @@ class alter_sentry_role_grant_privilege_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1131,7 +1133,7 @@ class alter_sentry_role_grant_privilege_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1197,7 +1199,7 @@ class alter_sentry_role_revoke_privilege_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1262,7 +1264,7 @@ class alter_sentry_role_revoke_privilege_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1328,7 +1330,7 @@ class alter_sentry_role_add_groups_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1393,7 +1395,7 @@ class alter_sentry_role_add_groups_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1459,7 +1461,7 @@ class alter_sentry_role_delete_groups_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1524,7 +1526,7 @@ class alter_sentry_role_delete_groups_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1590,7 +1592,7 @@ class list_sentry_roles_by_group_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1655,7 +1657,7 @@ class list_sentry_roles_by_group_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1721,7 +1723,7 @@ class list_sentry_privileges_by_role_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1786,7 +1788,7 @@ class list_sentry_privileges_by_role_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1852,7 +1854,7 @@ class list_sentry_privileges_for_provider_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1917,7 +1919,7 @@ class list_sentry_privileges_for_provider_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1983,7 +1985,7 @@ class list_sentry_privileges_by_authorizable_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2048,7 +2050,7 @@ class list_sentry_privileges_by_authorizable_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2114,7 +2116,7 @@ class drop_sentry_privilege_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2179,7 +2181,7 @@ class drop_sentry_privilege_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2245,7 +2247,7 @@ class rename_sentry_privilege_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2310,7 +2312,7 @@ class rename_sentry_privilege_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):

+ 2 - 1
desktop/libs/libsentry/gen-py/sentry_generic_policy_service/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 #
@@ -7,5 +8,5 @@
 #
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from sentry_generic_policy_service.ttypes import *
 

+ 51 - 49
desktop/libs/libsentry/gen-py/sentry_generic_policy_service/ttypes.py

@@ -6,6 +6,8 @@
 #  options string: py:new_style
 #
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import sentry_common_service.ttypes
 import sentry_policy_service.ttypes
@@ -110,7 +112,7 @@ class TAuthorizable(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -174,7 +176,7 @@ class TSentryPrivilege(object):
         if ftype == TType.LIST:
           self.authorizables = []
           (_etype3, _size0) = iprot.readListBegin()
-          for _i4 in xrange(_size0):
+          for _i4 in range(_size0):
             _elem5 = TAuthorizable()
             _elem5.read(iprot)
             self.authorizables.append(_elem5)
@@ -270,7 +272,7 @@ class TSentryPrivilege(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -382,7 +384,7 @@ class TCreateSentryRoleRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -450,7 +452,7 @@ class TCreateSentryRoleResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -562,7 +564,7 @@ class TDropSentryRoleRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -630,7 +632,7 @@ class TDropSentryRoleResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -698,7 +700,7 @@ class TAlterSentryRoleAddGroupsRequest(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype10, _size7) = iprot.readSetBegin()
-          for _i11 in xrange(_size7):
+          for _i11 in range(_size7):
             _elem12 = iprot.readString()
             self.groups.add(_elem12)
           iprot.readSetEnd()
@@ -765,7 +767,7 @@ class TAlterSentryRoleAddGroupsRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -833,7 +835,7 @@ class TAlterSentryRoleAddGroupsResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -901,7 +903,7 @@ class TAlterSentryRoleDeleteGroupsRequest(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype17, _size14) = iprot.readSetBegin()
-          for _i18 in xrange(_size14):
+          for _i18 in range(_size14):
             _elem19 = iprot.readString()
             self.groups.add(_elem19)
           iprot.readSetEnd()
@@ -968,7 +970,7 @@ class TAlterSentryRoleDeleteGroupsRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1036,7 +1038,7 @@ class TAlterSentryRoleDeleteGroupsResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1164,7 +1166,7 @@ class TAlterSentryRoleGrantPrivilegeRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1232,7 +1234,7 @@ class TAlterSentryRoleGrantPrivilegeResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1360,7 +1362,7 @@ class TAlterSentryRoleRevokePrivilegeRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1428,7 +1430,7 @@ class TAlterSentryRoleRevokePrivilegeResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1538,7 +1540,7 @@ class TListSentryRolesRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1582,7 +1584,7 @@ class TSentryRole(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype24, _size21) = iprot.readSetBegin()
-          for _i25 in xrange(_size21):
+          for _i25 in range(_size21):
             _elem26 = iprot.readString()
             self.groups.add(_elem26)
           iprot.readSetEnd()
@@ -1628,7 +1630,7 @@ class TSentryRole(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1673,7 +1675,7 @@ class TListSentryRolesResponse(object):
         if ftype == TType.SET:
           self.roles = set()
           (_etype31, _size28) = iprot.readSetBegin()
-          for _i32 in xrange(_size28):
+          for _i32 in range(_size28):
             _elem33 = TSentryRole()
             _elem33.read(iprot)
             self.roles.add(_elem33)
@@ -1718,7 +1720,7 @@ class TListSentryRolesResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1794,7 +1796,7 @@ class TListSentryPrivilegesRequest(object):
         if ftype == TType.LIST:
           self.authorizables = []
           (_etype38, _size35) = iprot.readListBegin()
-          for _i39 in xrange(_size35):
+          for _i39 in range(_size35):
             _elem40 = TAuthorizable()
             _elem40.read(iprot)
             self.authorizables.append(_elem40)
@@ -1867,7 +1869,7 @@ class TListSentryPrivilegesRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1912,7 +1914,7 @@ class TListSentryPrivilegesResponse(object):
         if ftype == TType.SET:
           self.privileges = set()
           (_etype45, _size42) = iprot.readSetBegin()
-          for _i46 in xrange(_size42):
+          for _i46 in range(_size42):
             _elem47 = TSentryPrivilege()
             _elem47.read(iprot)
             self.privileges.add(_elem47)
@@ -1957,7 +1959,7 @@ class TListSentryPrivilegesResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2070,7 +2072,7 @@ class TDropPrivilegesRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2138,7 +2140,7 @@ class TDropPrivilegesResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2209,7 +2211,7 @@ class TRenamePrivilegesRequest(object):
         if ftype == TType.LIST:
           self.oldAuthorizables = []
           (_etype52, _size49) = iprot.readListBegin()
-          for _i53 in xrange(_size49):
+          for _i53 in range(_size49):
             _elem54 = TAuthorizable()
             _elem54.read(iprot)
             self.oldAuthorizables.append(_elem54)
@@ -2220,7 +2222,7 @@ class TRenamePrivilegesRequest(object):
         if ftype == TType.LIST:
           self.newAuthorizables = []
           (_etype58, _size55) = iprot.readListBegin()
-          for _i59 in xrange(_size55):
+          for _i59 in range(_size55):
             _elem60 = TAuthorizable()
             _elem60.read(iprot)
             self.newAuthorizables.append(_elem60)
@@ -2298,7 +2300,7 @@ class TRenamePrivilegesRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2366,7 +2368,7 @@ class TRenamePrivilegesResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2410,7 +2412,7 @@ class TSentryActiveRoleSet(object):
         if ftype == TType.SET:
           self.roles = set()
           (_etype66, _size63) = iprot.readSetBegin()
-          for _i67 in xrange(_size63):
+          for _i67 in range(_size63):
             _elem68 = iprot.readString()
             self.roles.add(_elem68)
           iprot.readSetEnd()
@@ -2456,7 +2458,7 @@ class TSentryActiveRoleSet(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2522,7 +2524,7 @@ class TListSentryPrivilegesForProviderRequest(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype73, _size70) = iprot.readSetBegin()
-          for _i74 in xrange(_size70):
+          for _i74 in range(_size70):
             _elem75 = iprot.readString()
             self.groups.add(_elem75)
           iprot.readSetEnd()
@@ -2538,7 +2540,7 @@ class TListSentryPrivilegesForProviderRequest(object):
         if ftype == TType.LIST:
           self.authorizables = []
           (_etype79, _size76) = iprot.readListBegin()
-          for _i80 in xrange(_size76):
+          for _i80 in range(_size76):
             _elem81 = TAuthorizable()
             _elem81.read(iprot)
             self.authorizables.append(_elem81)
@@ -2614,7 +2616,7 @@ class TListSentryPrivilegesForProviderRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2659,7 +2661,7 @@ class TListSentryPrivilegesForProviderResponse(object):
         if ftype == TType.SET:
           self.privileges = set()
           (_etype87, _size84) = iprot.readSetBegin()
-          for _i88 in xrange(_size84):
+          for _i88 in range(_size84):
             _elem89 = iprot.readString()
             self.privileges.add(_elem89)
           iprot.readSetEnd()
@@ -2705,7 +2707,7 @@ class TListSentryPrivilegesForProviderResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2741,11 +2743,11 @@ class TSentryPrivilegeMap(object):
         if ftype == TType.MAP:
           self.privilegeMap = {}
           (_ktype92, _vtype93, _size91 ) = iprot.readMapBegin()
-          for _i95 in xrange(_size91):
+          for _i95 in range(_size91):
             _key96 = iprot.readString()
             _val97 = set()
             (_etype101, _size98) = iprot.readSetBegin()
-            for _i102 in xrange(_size98):
+            for _i102 in range(_size98):
               _elem103 = TSentryPrivilege()
               _elem103.read(iprot)
               _val97.add(_elem103)
@@ -2767,7 +2769,7 @@ class TSentryPrivilegeMap(object):
     if self.privilegeMap is not None:
       oprot.writeFieldBegin('privilegeMap', TType.MAP, 1)
       oprot.writeMapBegin(TType.STRING, TType.SET, len(self.privilegeMap))
-      for kiter104,viter105 in self.privilegeMap.items():
+      for kiter104,viter105 in list(self.privilegeMap.items()):
         oprot.writeString(kiter104)
         oprot.writeSetBegin(TType.STRUCT, len(viter105))
         for iter106 in viter105:
@@ -2791,7 +2793,7 @@ class TSentryPrivilegeMap(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2865,7 +2867,7 @@ class TListSentryPrivilegesByAuthRequest(object):
         if ftype == TType.SET:
           self.authorizablesSet = set()
           (_etype110, _size107) = iprot.readSetBegin()
-          for _i111 in xrange(_size107):
+          for _i111 in range(_size107):
             _elem112 = iprot.readString()
             self.authorizablesSet.add(_elem112)
           iprot.readSetEnd()
@@ -2875,7 +2877,7 @@ class TListSentryPrivilegesByAuthRequest(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype116, _size113) = iprot.readSetBegin()
-          for _i117 in xrange(_size113):
+          for _i117 in range(_size113):
             _elem118 = iprot.readString()
             self.groups.add(_elem118)
           iprot.readSetEnd()
@@ -2961,7 +2963,7 @@ class TListSentryPrivilegesByAuthRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -3006,7 +3008,7 @@ class TListSentryPrivilegesByAuthResponse(object):
         if ftype == TType.MAP:
           self.privilegesMapByAuth = {}
           (_ktype122, _vtype123, _size121 ) = iprot.readMapBegin()
-          for _i125 in xrange(_size121):
+          for _i125 in range(_size121):
             _key126 = iprot.readString()
             _val127 = TSentryPrivilegeMap()
             _val127.read(iprot)
@@ -3031,7 +3033,7 @@ class TListSentryPrivilegesByAuthResponse(object):
     if self.privilegesMapByAuth is not None:
       oprot.writeFieldBegin('privilegesMapByAuth', TType.MAP, 2)
       oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.privilegesMapByAuth))
-      for kiter128,viter129 in self.privilegesMapByAuth.items():
+      for kiter128,viter129 in list(self.privilegesMapByAuth.items()):
         oprot.writeString(kiter128)
         viter129.write(oprot)
       oprot.writeMapEnd()
@@ -3053,7 +3055,7 @@ class TListSentryPrivilegesByAuthResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):

+ 29 - 27
desktop/libs/libsentry/gen-py/sentry_policy_service/SentryPolicyService.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 #
@@ -6,9 +7,10 @@
 #  options string: py:new_style
 #
 
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import logging
-from ttypes import *
+from sentry_policy_service.ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol, TProtocol
@@ -862,7 +864,7 @@ class create_sentry_role_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -927,7 +929,7 @@ class create_sentry_role_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -993,7 +995,7 @@ class drop_sentry_role_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1058,7 +1060,7 @@ class drop_sentry_role_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1124,7 +1126,7 @@ class alter_sentry_role_grant_privilege_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1189,7 +1191,7 @@ class alter_sentry_role_grant_privilege_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1255,7 +1257,7 @@ class alter_sentry_role_revoke_privilege_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1320,7 +1322,7 @@ class alter_sentry_role_revoke_privilege_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1386,7 +1388,7 @@ class alter_sentry_role_add_groups_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1451,7 +1453,7 @@ class alter_sentry_role_add_groups_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1517,7 +1519,7 @@ class alter_sentry_role_delete_groups_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1582,7 +1584,7 @@ class alter_sentry_role_delete_groups_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1648,7 +1650,7 @@ class list_sentry_roles_by_group_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1713,7 +1715,7 @@ class list_sentry_roles_by_group_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1779,7 +1781,7 @@ class list_sentry_privileges_by_role_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1844,7 +1846,7 @@ class list_sentry_privileges_by_role_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1910,7 +1912,7 @@ class list_sentry_privileges_for_provider_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1975,7 +1977,7 @@ class list_sentry_privileges_for_provider_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2041,7 +2043,7 @@ class drop_sentry_privilege_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2106,7 +2108,7 @@ class drop_sentry_privilege_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2172,7 +2174,7 @@ class rename_sentry_privilege_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2237,7 +2239,7 @@ class rename_sentry_privilege_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2303,7 +2305,7 @@ class list_sentry_privileges_by_authorizable_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2368,7 +2370,7 @@ class list_sentry_privileges_by_authorizable_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2434,7 +2436,7 @@ class get_sentry_config_value_args(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2499,7 +2501,7 @@ class get_sentry_config_value_result(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):

+ 2 - 1
desktop/libs/libsentry/gen-py/sentry_policy_service/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 #
@@ -7,5 +8,5 @@
 #
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from sentry_policy_service.ttypes import *
 

+ 52 - 50
desktop/libs/libsentry/gen-py/sentry_policy_service/ttypes.py

@@ -6,6 +6,8 @@
 #  options string: py:new_style
 #
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import sentry_common_service.ttypes
 
@@ -203,7 +205,7 @@ class TSentryPrivilege(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -270,7 +272,7 @@ class TSentryGroup(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -367,7 +369,7 @@ class TCreateSentryRoleRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -435,7 +437,7 @@ class TCreateSentryRoleResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -532,7 +534,7 @@ class TDropSentryRoleRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -600,7 +602,7 @@ class TDropSentryRoleResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -661,7 +663,7 @@ class TAlterSentryRoleAddGroupsRequest(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype3, _size0) = iprot.readSetBegin()
-          for _i4 in xrange(_size0):
+          for _i4 in range(_size0):
             _elem5 = TSentryGroup()
             _elem5.read(iprot)
             self.groups.add(_elem5)
@@ -722,7 +724,7 @@ class TAlterSentryRoleAddGroupsRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -790,7 +792,7 @@ class TAlterSentryRoleAddGroupsResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -851,7 +853,7 @@ class TAlterSentryRoleDeleteGroupsRequest(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype10, _size7) = iprot.readSetBegin()
-          for _i11 in xrange(_size7):
+          for _i11 in range(_size7):
             _elem12 = TSentryGroup()
             _elem12.read(iprot)
             self.groups.add(_elem12)
@@ -912,7 +914,7 @@ class TAlterSentryRoleDeleteGroupsRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -980,7 +982,7 @@ class TAlterSentryRoleDeleteGroupsResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1050,7 +1052,7 @@ class TAlterSentryRoleGrantPrivilegeRequest(object):
         if ftype == TType.SET:
           self.privileges = set()
           (_etype17, _size14) = iprot.readSetBegin()
-          for _i18 in xrange(_size14):
+          for _i18 in range(_size14):
             _elem19 = TSentryPrivilege()
             _elem19.read(iprot)
             self.privileges.add(_elem19)
@@ -1114,7 +1116,7 @@ class TAlterSentryRoleGrantPrivilegeRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1168,7 +1170,7 @@ class TAlterSentryRoleGrantPrivilegeResponse(object):
         if ftype == TType.SET:
           self.privileges = set()
           (_etype24, _size21) = iprot.readSetBegin()
-          for _i25 in xrange(_size21):
+          for _i25 in range(_size21):
             _elem26 = TSentryPrivilege()
             _elem26.read(iprot)
             self.privileges.add(_elem26)
@@ -1218,7 +1220,7 @@ class TAlterSentryRoleGrantPrivilegeResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1288,7 +1290,7 @@ class TAlterSentryRoleRevokePrivilegeRequest(object):
         if ftype == TType.SET:
           self.privileges = set()
           (_etype31, _size28) = iprot.readSetBegin()
-          for _i32 in xrange(_size28):
+          for _i32 in range(_size28):
             _elem33 = TSentryPrivilege()
             _elem33.read(iprot)
             self.privileges.add(_elem33)
@@ -1352,7 +1354,7 @@ class TAlterSentryRoleRevokePrivilegeRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1420,7 +1422,7 @@ class TAlterSentryRoleRevokePrivilegeResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1515,7 +1517,7 @@ class TListSentryRolesRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1562,7 +1564,7 @@ class TSentryRole(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype38, _size35) = iprot.readSetBegin()
-          for _i39 in xrange(_size35):
+          for _i39 in range(_size35):
             _elem40 = TSentryGroup()
             _elem40.read(iprot)
             self.groups.add(_elem40)
@@ -1621,7 +1623,7 @@ class TSentryRole(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1666,7 +1668,7 @@ class TListSentryRolesResponse(object):
         if ftype == TType.SET:
           self.roles = set()
           (_etype45, _size42) = iprot.readSetBegin()
-          for _i46 in xrange(_size42):
+          for _i46 in range(_size42):
             _elem47 = TSentryRole()
             _elem47.read(iprot)
             self.roles.add(_elem47)
@@ -1711,7 +1713,7 @@ class TListSentryRolesResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1830,7 +1832,7 @@ class TSentryAuthorizable(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1942,7 +1944,7 @@ class TListSentryPrivilegesRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -1987,7 +1989,7 @@ class TListSentryPrivilegesResponse(object):
         if ftype == TType.SET:
           self.privileges = set()
           (_etype52, _size49) = iprot.readSetBegin()
-          for _i53 in xrange(_size49):
+          for _i53 in range(_size49):
             _elem54 = TSentryPrivilege()
             _elem54.read(iprot)
             self.privileges.add(_elem54)
@@ -2032,7 +2034,7 @@ class TListSentryPrivilegesResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2130,7 +2132,7 @@ class TDropPrivilegesRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2198,7 +2200,7 @@ class TDropPrivilegesResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2312,7 +2314,7 @@ class TRenamePrivilegesRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2380,7 +2382,7 @@ class TRenamePrivilegesResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2424,7 +2426,7 @@ class TSentryActiveRoleSet(object):
         if ftype == TType.SET:
           self.roles = set()
           (_etype59, _size56) = iprot.readSetBegin()
-          for _i60 in xrange(_size56):
+          for _i60 in range(_size56):
             _elem61 = iprot.readString()
             self.roles.add(_elem61)
           iprot.readSetEnd()
@@ -2470,7 +2472,7 @@ class TSentryActiveRoleSet(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2520,7 +2522,7 @@ class TListSentryPrivilegesForProviderRequest(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype66, _size63) = iprot.readSetBegin()
-          for _i67 in xrange(_size63):
+          for _i67 in range(_size63):
             _elem68 = iprot.readString()
             self.groups.add(_elem68)
           iprot.readSetEnd()
@@ -2590,7 +2592,7 @@ class TListSentryPrivilegesForProviderRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2635,7 +2637,7 @@ class TListSentryPrivilegesForProviderResponse(object):
         if ftype == TType.SET:
           self.privileges = set()
           (_etype73, _size70) = iprot.readSetBegin()
-          for _i74 in xrange(_size70):
+          for _i74 in range(_size70):
             _elem75 = iprot.readString()
             self.privileges.add(_elem75)
           iprot.readSetEnd()
@@ -2681,7 +2683,7 @@ class TListSentryPrivilegesForProviderResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2717,11 +2719,11 @@ class TSentryPrivilegeMap(object):
         if ftype == TType.MAP:
           self.privilegeMap = {}
           (_ktype78, _vtype79, _size77 ) = iprot.readMapBegin()
-          for _i81 in xrange(_size77):
+          for _i81 in range(_size77):
             _key82 = iprot.readString()
             _val83 = set()
             (_etype87, _size84) = iprot.readSetBegin()
-            for _i88 in xrange(_size84):
+            for _i88 in range(_size84):
               _elem89 = TSentryPrivilege()
               _elem89.read(iprot)
               _val83.add(_elem89)
@@ -2743,7 +2745,7 @@ class TSentryPrivilegeMap(object):
     if self.privilegeMap is not None:
       oprot.writeFieldBegin('privilegeMap', TType.MAP, 1)
       oprot.writeMapBegin(TType.STRING, TType.SET, len(self.privilegeMap))
-      for kiter90,viter91 in self.privilegeMap.items():
+      for kiter90,viter91 in list(self.privilegeMap.items()):
         oprot.writeString(kiter90)
         oprot.writeSetBegin(TType.STRUCT, len(viter91))
         for iter92 in viter91:
@@ -2767,7 +2769,7 @@ class TSentryPrivilegeMap(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2825,7 +2827,7 @@ class TListSentryPrivilegesByAuthRequest(object):
         if ftype == TType.SET:
           self.authorizableSet = set()
           (_etype96, _size93) = iprot.readSetBegin()
-          for _i97 in xrange(_size93):
+          for _i97 in range(_size93):
             _elem98 = TSentryAuthorizable()
             _elem98.read(iprot)
             self.authorizableSet.add(_elem98)
@@ -2836,7 +2838,7 @@ class TListSentryPrivilegesByAuthRequest(object):
         if ftype == TType.SET:
           self.groups = set()
           (_etype102, _size99) = iprot.readSetBegin()
-          for _i103 in xrange(_size99):
+          for _i103 in range(_size99):
             _elem104 = iprot.readString()
             self.groups.add(_elem104)
           iprot.readSetEnd()
@@ -2908,7 +2910,7 @@ class TListSentryPrivilegesByAuthRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -2953,7 +2955,7 @@ class TListSentryPrivilegesByAuthResponse(object):
         if ftype == TType.MAP:
           self.privilegesMapByAuth = {}
           (_ktype108, _vtype109, _size107 ) = iprot.readMapBegin()
-          for _i111 in xrange(_size107):
+          for _i111 in range(_size107):
             _key112 = TSentryAuthorizable()
             _key112.read(iprot)
             _val113 = TSentryPrivilegeMap()
@@ -2979,7 +2981,7 @@ class TListSentryPrivilegesByAuthResponse(object):
     if self.privilegesMapByAuth is not None:
       oprot.writeFieldBegin('privilegesMapByAuth', TType.MAP, 2)
       oprot.writeMapBegin(TType.STRUCT, TType.STRUCT, len(self.privilegesMapByAuth))
-      for kiter114,viter115 in self.privilegesMapByAuth.items():
+      for kiter114,viter115 in list(self.privilegesMapByAuth.items()):
         kiter114.write(oprot)
         viter115.write(oprot)
       oprot.writeMapEnd()
@@ -3001,7 +3003,7 @@ class TListSentryPrivilegesByAuthResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -3096,7 +3098,7 @@ class TSentryConfigValueRequest(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):
@@ -3177,7 +3179,7 @@ class TSentryConfigValueResponse(object):
 
   def __repr__(self):
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
   def __eq__(self, other):

+ 6 - 5
desktop/libs/libsentry/src/libsentry/api.py

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import object
 import logging
 import threading
 
@@ -39,7 +40,7 @@ def ha_error_handler(func):
   def decorator(*args, **kwargs):
     try:
       return func(*args, **kwargs)
-    except StructuredThriftTransportException, e:
+    except StructuredThriftTransportException as e:
       if not is_ha_enabled():
         raise PopupException(_('Failed to connect to Sentry server %s, and Sentry HA is not enabled.') % args[0].client.host, detail=e)
       else:
@@ -51,9 +52,9 @@ def ha_error_handler(func):
           return func(*args, **kwargs)
         else:
           raise PopupException(_('Failed to find an available Sentry server.'))
-    except (SentryException, PopupException), e:
+    except (SentryException, PopupException) as e:
       raise e
-    except Exception, e:
+    except Exception as e:
       raise PopupException(_('Encountered unexpected error in SentryApi.'), detail=e)
 
   return decorator
@@ -202,9 +203,9 @@ class SentryApi(object):
 
     _privileges = []
 
-    for authorizable, roles in response.privilegesMapByAuth.iteritems():
+    for authorizable, roles in response.privilegesMapByAuth.items():
       _roles = {}
-      for role, privileges in roles.privilegeMap.iteritems():
+      for role, privileges in roles.privilegeMap.items():
         _roles[role] = [self._massage_privilege(privilege) for privilege in privileges]
       _privileges.append((self._massage_authorizable(authorizable), _roles))
 

+ 6 - 5
desktop/libs/libsentry/src/libsentry/api2.py

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import object
 import logging
 import threading
 
@@ -39,7 +40,7 @@ def ha_error_handler(func):
   def decorator(*args, **kwargs):
     try:
       return func(*args, **kwargs)
-    except StructuredThriftTransportException, e:
+    except StructuredThriftTransportException as e:
       if not is_ha_enabled():
         raise PopupException(_('Failed to connect to Sentry server %s, and Sentry HA is not enabled.') % args[0].client.host, detail=e)
       else:
@@ -51,9 +52,9 @@ def ha_error_handler(func):
           return func(*args, **kwargs)
         else:
           raise PopupException(_('Failed to find an available Sentry server.'))
-    except (SentryException, PopupException), e:
+    except (SentryException, PopupException) as e:
       raise e
-    except Exception, e:
+    except Exception as e:
       raise PopupException(_('Encountered unexpected error in SentryApi.'), detail=e)
 
   return decorator
@@ -205,9 +206,9 @@ class SentryApi(object):
 
     _privileges = []
 
-    for authorizable, roles in response.privilegesMapByAuth.iteritems():
+    for authorizable, roles in response.privilegesMapByAuth.items():
       _roles = {}
-      for role, privileges in roles.privilegeMap.iteritems():
+      for role, privileges in roles.privilegeMap.items():
         _roles[role] = [self._massage_privilege(privilege) for privilege in privileges]
       _privileges.append((self._massage_string_authorizable(authorizable), _roles))
 

+ 2 - 0
desktop/libs/libsentry/src/libsentry/client.py

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import map
+from builtins import object
 import logging
 
 from desktop.lib import thrift_util

+ 2 - 0
desktop/libs/libsentry/src/libsentry/client2.py

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import map
+from builtins import object
 import logging
 
 from desktop.lib import thrift_util

+ 3 - 2
desktop/libs/libsentry/src/libsentry/privilege_checker.py

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import object
 import logging
 
 from collections import defaultdict
@@ -114,7 +115,7 @@ class PrivilegeChecker(object):
         try:
           if self._is_object_action_authorized_v1(hierarchy=self.privilege_hierarchy_v1, object=authorizable, action=action):
             yield object
-        except KeyError, e:
+        except KeyError as e:
           LOG.warn('Skipping %s: %s' % (authorizable, e))
 
     if v2_authorizables:
@@ -122,7 +123,7 @@ class PrivilegeChecker(object):
         try:
           if self._is_object_action_authorized_v2(hierarchy=self.privilege_hierarchy_v2, object=authorizable, action=action):
             yield object
-        except KeyError, e:
+        except KeyError as e:
           LOG.warn('Skipping %s: %s' % (authorizable, e))
 
 

+ 2 - 2
desktop/libs/libsentry/src/libsentry/sentry_ha.py

@@ -65,14 +65,14 @@ def get_next_available_server(client_class, username, failed_host=None, componen
       # If above operation succeeds, return client
       LOG.info('Successfully connected to Sentry server %s, after attempting [%s], returning client.' % (client.host, ', '.join(attempted_hosts)))
       return next_server, attempted_hosts
-    except StructuredThriftTransportException, e:
+    except StructuredThriftTransportException as e:
       # If we have come back around to the original failed client, exit
       if client.host == failed_host:
         has_next = False
       else:
         current_host = client.host
         attempted_hosts.append(current_host)
-    except Exception, e:
+    except Exception as e:
       raise PopupException(_('Encountered unexpected error while trying to find available Sentry client: %s' % e))
 
   return None, attempted_hosts

+ 4 - 4
desktop/libs/libsentry/src/libsentry/sentry_site.py

@@ -116,7 +116,7 @@ def get_sentry_server(current_host=None):
         current_idx = hosts.index(current_host)
         LOG.debug("Current Sentry host, %s, index is: %d." % (current_host, current_idx))
         next_idx = (current_idx + 1) % len(servers)
-      except ValueError, e:
+      except ValueError as e:
         LOG.warn("Current host: %s not found in list of servers: %s" % (current_host, ','.join(hosts)))
 
     server = servers[next_idx]
@@ -148,7 +148,7 @@ def get_sentry_servers():
       else:
         port = PORT.get()
       servers.append({'hostname': host, 'port': int(port)})
-  except Exception, e:
+  except Exception as e:
     raise PopupException(_('Error in retrieving Sentry server properties.'), detail=e)
 
   LOG.debug("Sentry servers are: %s" % ', '.join(['%s:%d' % (s['hostname'], s['port']) for s in servers]))
@@ -166,7 +166,7 @@ def _parse_sites():
   try:
     from beeswax.conf import HIVE_CONF_DIR
     paths.append(('hive', os.path.join(HIVE_CONF_DIR.get(), 'sentry-site.xml')))
-  except Exception, e:
+  except Exception as e:
     LOG.error('Cannot read Hive sentry site: %s' % e)
 
   for name, path in paths:
@@ -176,7 +176,7 @@ def _parse_sites():
 def _parse_site(site_path):
   try:
     data = file(site_path, 'r').read()
-  except IOError, err:
+  except IOError as err:
     if err.errno != errno.ENOENT:
       LOG.error('Cannot read from "%s": %s' % (site_path, err))
       return

+ 1 - 0
desktop/libs/libsentry/src/libsentry/test_privilege_checker.py

@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import object
 import pickle
 
 from django.contrib.auth.models import User

+ 1 - 0
desktop/libs/libsentry/src/libsentry/tests.py

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import object
 import lxml.etree
 import os
 import shutil