← Back to branch summary

~cjwatson/storm/move-tests

« back to all changes in this revision

Viewing changes to tests/schema/patch.py

  • Committer: Colin Watson
  • Date: 2019-05-31 15:28:04 UTC
  • mfrom: (487.2.2 py3-exceptions)
  • Revision ID: cjwatson@canonical.com-20190531152804-jk4ykojm7k1fvjtf
Use Python 3-friendly "except" syntax. [r=simpoir]

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/schema/patch.py
345
345
        self.add_module("patch_999.py", patch_no_args_apply)
346
346
        try:
347
347
            self.patch_applier.apply_all()
348
 
        except BadPatchError, e:
 
348
        except BadPatchError as e:
349
349
            self.assertTrue("mypackage/patch_999.py" in str(e))
350
350
            self.assertTrue("takes no arguments" in str(e))
351
351
            self.assertTrue("TypeError" in str(e))
360
360
        self.add_module("patch_999.py", patch_missing_apply)
361
361
        try:
362
362
            self.patch_applier.apply_all()
363
 
        except BadPatchError, e:
 
363
        except BadPatchError as e:
364
364
            self.assertTrue("mypackage/patch_999.py" in str(e))
365
365
            self.assertTrue("no attribute" in str(e))
366
366
            self.assertTrue("AttributeError" in str(e))
375
375
        self.add_module("patch_999.py", "that's not python")
376
376
        try:
377
377
            self.patch_applier.apply_all()
378
 
        except BadPatchError, e:
 
378
        except BadPatchError as e:
379
379
            self.assertTrue(" 999 " in str(e))
380
380
            self.assertTrue("SyntaxError" in str(e))
381
381
        else:
389
389
        self.add_module("patch_999.py", patch_name_error)
390
390
        try:
391
391
            self.patch_applier.apply_all()
392
 
        except BadPatchError, e:
 
392
        except BadPatchError as e:
393
393
            self.assertTrue("mypackage/patch_999.py" in str(e))
394
394
            self.assertTrue("NameError" in str(e))
395
395
            self.assertTrue("blah" in str(e))