aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-23 19:23:43 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-23 19:23:43 -0500
commita5c6e9a89242bb42dbc98f29681d2f74aec12b02 (patch)
tree57b2686b8455a561dc2a5f3d2d2a263e46cb1da2 /src
parent58b756969211e2972fb6fda44582e55b98c02924 (diff)
downloadcryptography-a5c6e9a89242bb42dbc98f29681d2f74aec12b02.tar.gz
cryptography-a5c6e9a89242bb42dbc98f29681d2f74aec12b02.tar.bz2
cryptography-a5c6e9a89242bb42dbc98f29681d2f74aec12b02.zip
use kwargs for BasicConstraints creation
Also check path_length using integer_types
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/x509.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 0c773dac..43ece920 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -176,8 +176,11 @@ class BasicConstraints(object):
if path_length is not None and not ca:
raise ValueError("path_length must be None when ca is False")
- if path_length is not None and (not isinstance(path_length, int)
- or path_length < 0):
+ if (
+ path_length is not None and (not isinstance(
+ path_length, six.integer_types
+ ) or path_length < 0)
+ ):
raise TypeError(
"path_length must be a non-negative integer or None"
)