x509: Port to Python 3

In python 3 , `bytes` has the buffer interface, and `buffer` was removed.

Also, invalid padding in base64-encoded data raises a ValueError rather
than TypeError.

In tests, use pytest.assert_raises for more correct exception assertions.
Also, get rid of unused imports in the tests

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

1 files changed, 6 insertions, 15 deletions

diff --git a/ipatests/test_ipalib/test_x509.py b/ipatests/test_ipalib/test_x509.py
index c7fafbbd9..d8004c4a0 100644
--- a/ipatests/test_ipalib/test_x509.py
+++ b/ipatests/test_ipalib/test_x509.py
@@ -21,17 +21,12 @@
 Test the `ipalib.x509` module.
 """
 
-import os
-from os import path
-import sys
-from ipatests.util import raises, setitem, delitem, ClassChecker
-from ipatests.util import getitem, setitem, delitem
-from ipatests.util import TempDir, TempHome
-from ipalib.constants import TYPE_ERROR, OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
-from ipalib.constants import NAME_REGEX, NAME_ERROR
 import base64
-from ipalib import x509
+
+import pytest
 from nss.error import NSPRError
+
+from ipalib import x509
 from ipapython.dn import DN
 
 # certutil -
@@ -66,16 +61,12 @@ class test_x509(object):
 
         # Load a good cert with bad headers
         newcert = '-----BEGIN CERTIFICATE-----' + goodcert
-        try:
+        with pytest.raises((TypeError, ValueError)):
             cert = x509.load_certificate(newcert)
-        except TypeError:
-            pass
 
         # Load a bad cert
-        try:
+        with pytest.raises(NSPRError):
             cert = x509.load_certificate(badcert)
-        except NSPRError:
-            pass
 
     def test_1_load_der_cert(self):
         """