Remove tuple unpacking from except clause ipaserver/dcerpc.py

Python 3 doesn't support tuple unpacking in except clauses. All implicit
tuple unpackings have been replaced with explicit unpacking of e.args.

https://fedorahosted.org/freeipa/ticket/5120

Reviewed-By: Tomas Babej <tbabej@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index a1da0a641..4de5afb54 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -772,7 +772,8 @@ class TrustDomainInstance(object):
        try:
            result = lsa.lsarpc(binding, self.parm, self.creds)
            return result
-       except RuntimeError, (num, message):
+       except RuntimeError as e:
+           num, message = e.args
            raise assess_dcerpc_exception(num=num, message=message)
 
     def init_lsa_pipe(self, remote_host):
@@ -889,7 +890,8 @@ class TrustDomainInstance(object):
         try:
             self._policy_handle = self._pipe.OpenPolicy2(u"", objectAttribute, security.SEC_FLAG_MAXIMUM_ALLOWED)
             result = self._pipe.QueryInfoPolicy2(self._policy_handle, lsa.LSA_POLICY_INFO_DNS)
-        except RuntimeError, (num, message):
+        except RuntimeError as e:
+            num, message = e.args
             raise assess_dcerpc_exception(num=num, message=message)
 
         self.info['name'] = unicode(result.name.string)
@@ -901,7 +903,8 @@ class TrustDomainInstance(object):
 
         try:
             result = self._pipe.QueryInfoPolicy2(self._policy_handle, lsa.LSA_POLICY_INFO_ROLE)
-        except RuntimeError, (num, message):
+        except RuntimeError as e:
+            num, message = e.args
             raise assess_dcerpc_exception(num=num, message=message)
 
         self.info['is_pdc'] = (result.role == lsa.LSA_ROLE_PRIMARY)
@@ -1030,14 +1033,16 @@ class TrustDomainInstance(object):
             dname.string = another_domain.info['dns_domain']
             res = self._pipe.QueryTrustedDomainInfoByName(self._policy_handle, dname, lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO)
             self._pipe.DeleteTrustedDomain(self._policy_handle, res.info_ex.sid)
-        except RuntimeError, (num, message):
+        except RuntimeError as e:
+            num, message = e.args
             # Ignore anything but access denied (NT_STATUS_ACCESS_DENIED)
             if num == -1073741790:
                 raise access_denied_error
 
         try:
             trustdom_handle = self._pipe.CreateTrustedDomainEx2(self._policy_handle, info, self.auth_info, security.SEC_STD_DELETE)
-        except RuntimeError, (num, message):
+        except RuntimeError as e:
+            num, message = e.args
             raise assess_dcerpc_exception(num=num, message=message)
 
         # We should use proper trustdom handle in order to modify the
@@ -1078,7 +1083,8 @@ class TrustDomainInstance(object):
                                            data=data
                                            )
                 return result
-            except RuntimeError, (num, message):
+            except RuntimeError as e:
+                num, message = e.args
                 raise assess_dcerpc_exception(num=num, message=message)
 
         result = retrieve_netlogon_info_2(None, self,