aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2020-01-12 23:29:17 +0100
committerPaul Kehrer <paul.l.kehrer@gmail.com>2020-01-12 17:29:17 -0500
commita849f40556bd022c7478a44e935359c5fac83193 (patch)
tree9bbcf916f639c3729e3f609c3d282efe5bfbb96a /src
parent1d6ef10910b17fded7f1c7fbd6f20e485697e6e9 (diff)
downloadcryptography-a849f40556bd022c7478a44e935359c5fac83193.tar.gz
cryptography-a849f40556bd022c7478a44e935359c5fac83193.tar.bz2
cryptography-a849f40556bd022c7478a44e935359c5fac83193.zip
Use literals for collections and comprehensions. (#5091)
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/decode_asn1.py2
-rw-r--r--src/cryptography/x509/name.py2
-rw-r--r--src/cryptography/x509/ocsp.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/decode_asn1.py b/src/cryptography/hazmat/backends/openssl/decode_asn1.py
index 87a3cc73..7639e689 100644
--- a/src/cryptography/hazmat/backends/openssl/decode_asn1.py
+++ b/src/cryptography/hazmat/backends/openssl/decode_asn1.py
@@ -64,7 +64,7 @@ def _decode_x509_name(backend, x509_name):
attribute = _decode_x509_name_entry(backend, entry)
set_id = backend._lib.Cryptography_X509_NAME_ENTRY_set(entry)
if set_id != prev_set_id:
- attributes.append(set([attribute]))
+ attributes.append({attribute})
else:
# is in the same RDN a previous entry
attributes[-1].add(attribute)
diff --git a/src/cryptography/x509/name.py b/src/cryptography/x509/name.py
index ca2a1754..0d58acdd 100644
--- a/src/cryptography/x509/name.py
+++ b/src/cryptography/x509/name.py
@@ -25,7 +25,7 @@ class _ASN1Type(Enum):
BMPString = 30
-_ASN1_TYPE_TO_ENUM = dict((i.value, i) for i in _ASN1Type)
+_ASN1_TYPE_TO_ENUM = {i.value: i for i in _ASN1Type}
_SENTINEL = object()
_NAMEOID_DEFAULT_TYPE = {
NameOID.COUNTRY_NAME: _ASN1Type.PrintableString,
diff --git a/src/cryptography/x509/ocsp.py b/src/cryptography/x509/ocsp.py
index fb357334..4e0c985a 100644
--- a/src/cryptography/x509/ocsp.py
+++ b/src/cryptography/x509/ocsp.py
@@ -41,7 +41,7 @@ class OCSPResponseStatus(Enum):
UNAUTHORIZED = 6
-_RESPONSE_STATUS_TO_ENUM = dict((x.value, x) for x in OCSPResponseStatus)
+_RESPONSE_STATUS_TO_ENUM = {x.value: x for x in OCSPResponseStatus}
_ALLOWED_HASHES = (
hashes.SHA1, hashes.SHA224, hashes.SHA256,
hashes.SHA384, hashes.SHA512
@@ -61,7 +61,7 @@ class OCSPCertStatus(Enum):
UNKNOWN = 2
-_CERT_STATUS_TO_ENUM = dict((x.value, x) for x in OCSPCertStatus)
+_CERT_STATUS_TO_ENUM = {x.value: x for x in OCSPCertStatus}
def load_der_ocsp_request(data):