sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-18 08:23:51 +03:00
Code Activity

samba-tool: convert 'except X, e' to 'except X as e' for all X

Browse Source 
This is needed for Python 3 and is compatible with python 2.6

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall
2018-02-14 10:07:23 +13:00
committed by Andrew Bartlett
parent 278ac39384
commit a485ac3243
15 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/samba/netcmd/ntacl.py
View File

@@ -71,7 +71,7 @@ class cmd_ntacl_set(Command):
try:
samdb = SamDB(session_info=system_session(),
lp=lp)
except Exception, e:
except Exception as e:
raise CommandError("Unable to open samdb:", e)
if not use_ntvfs and not use_s3fs:
@@ -146,7 +146,7 @@ class cmd_ntacl_get(Command):
try:
samdb = SamDB(session_info=system_session(),
lp=lp)
except Exception, e:
except Exception as e:
raise CommandError("Unable to open samdb:", e)
if not use_ntvfs and not use_s3fs:
@@ -199,7 +199,7 @@ class cmd_ntacl_sysvolreset(Command):
try:
samdb = SamDB(session_info=system_session(),
lp=lp)
except Exception, e:
except Exception as e:
raise CommandError("Unable to open samdb:", e)
if not use_ntvfs and not use_s3fs:
@@ -259,7 +259,7 @@ class cmd_ntacl_sysvolcheck(Command):
sysvol = lp.get("path", "sysvol")
try:
samdb = SamDB(session_info=system_session(), lp=lp)
except Exception, e:
except Exception as e:
raise CommandError("Unable to open samdb:", e)
domain_sid = security.dom_sid(samdb.domain_sid)