drs torture python: convert 'except X, e' to 'except X as e'

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/torture/drs/python/linked_attributes_drs.py b/source4/torture/drs/python/linked_attributes_drs.py
index 160135e7fdd59b1a0378757d4bf5300e8ce59b89..0f96f64c8928de66a2a2969518890bb4e81f2d54 100644 (file)
--- a/source4/torture/drs/python/linked_attributes_drs.py
+++ b/source4/torture/drs/python/linked_attributes_drs.py
@@ -43,7 +43,7 @@ class LATests(drs_base.DrsBaseTestCase):
         if True:
             try:
                 self.samdb.delete(self.ou, ['tree_delete:1'])
-            except ldb.LdbError, e:
+            except ldb.LdbError as e:
                 pass
         self.samdb.add({'objectclass': 'organizationalUnit',
                         'dn': self.ou})
@@ -55,7 +55,7 @@ class LATests(drs_base.DrsBaseTestCase):
         super(LATests, self).tearDown()
         try:
             self.samdb.delete(self.ou, ['tree_delete:1'])
-        except ldb.LdbError, e:
+        except ldb.LdbError as e:
             pass
 
     def delete_user(self, user):

diff --git a/source4/torture/drs/python/ridalloc_exop.py b/source4/torture/drs/python/ridalloc_exop.py
index 80d011132ff1d45a2cf8675192f9ce2266232278..5d44aaaf7543aa1e8a5f001ee004e377096f5976 100644 (file)
--- a/source4/torture/drs/python/ridalloc_exop.py
+++ b/source4/torture/drs/python/ridalloc_exop.py
@@ -231,7 +231,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
             # 3. Make sure the allocation succeeds
             try:
                 (level, ctr) = drs.DsGetNCChanges(drs_handle, 8, req8)
-            except RuntimeError, e:
+            except RuntimeError as e:
                 self.fail("RID allocation failed: " + str(e))
 
             fsmo_dn = ldb.Dn(self.ldb_dc1, "CN=RID Manager$,CN=System," + self.ldb_dc1.domain_dn())