Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-acme for openSUSE:Factory
checked in at 2021-05-12 19:32:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-acme (Old)
and /work/SRC/openSUSE:Factory/.python-acme.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-acme"
Wed May 12 19:32:31 2021 rev:51 rq:892476 version:1.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-acme/python-acme.changes 2021-04-15
16:58:22.898765851 +0200
+++ /work/SRC/openSUSE:Factory/.python-acme.new.2988/python-acme.changes
2021-05-12 19:33:05.514831555 +0200
@@ -1,0 +2,6 @@
+Wed May 12 12:01:16 UTC 2021 - Mark??ta Machov?? <mmach...@suse.com>
+
+- update to version 1.15.0
+ * sync with main certbot package
+
+-------------------------------------------------------------------
Old:
----
acme-1.14.0.tar.gz
acme-1.14.0.tar.gz.asc
New:
----
acme-1.15.0.tar.gz
acme-1.15.0.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-acme.spec ++++++
--- /var/tmp/diff_new_pack.0Wl6HH/_old 2021-05-12 19:33:06.014829557 +0200
+++ /var/tmp/diff_new_pack.0Wl6HH/_new 2021-05-12 19:33:06.014829557 +0200
@@ -20,7 +20,7 @@
%define skip_python2 1
%define libname acme
Name: python-%{libname}
-Version: 1.14.0
+Version: 1.15.0
Release: 0
Summary: Python library for the ACME protocol
License: Apache-2.0
++++++ acme-1.14.0.tar.gz -> acme-1.15.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/PKG-INFO new/acme-1.15.0/PKG-INFO
--- old/acme-1.14.0/PKG-INFO 2021-04-06 19:17:08.820735500 +0200
+++ new/acme-1.15.0/PKG-INFO 2021-05-04 20:48:43.009578700 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 2.1
Name: acme
-Version: 1.14.0
+Version: 1.15.0
Summary: ACME protocol implementation in Python
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
-Author-email: client-...@letsencrypt.org
+Author-email: certbot-...@eff.org
License: Apache License 2.0
Description: UNKNOWN
Platform: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/acme/challenges.py
new/acme-1.15.0/acme/challenges.py
--- old/acme-1.14.0/acme/challenges.py 2021-04-06 19:17:00.000000000 +0200
+++ new/acme-1.15.0/acme/challenges.py 2021-05-04 20:48:08.000000000 +0200
@@ -30,7 +30,7 @@
@classmethod
def from_json(cls, jobj):
try:
- return super(Challenge, cls).from_json(jobj)
+ return super().from_json(jobj)
except jose.UnrecognizedTypeError as error:
logger.debug(error)
return UnrecognizedChallenge.from_json(jobj)
@@ -58,7 +58,7 @@
"""
def __init__(self, jobj):
- super(UnrecognizedChallenge, self).__init__()
+ super().__init__()
object.__setattr__(self, "jobj", jobj)
def to_partial_json(self):
@@ -141,7 +141,7 @@
return True
def to_partial_json(self):
- jobj = super(KeyAuthorizationChallengeResponse, self).to_partial_json()
+ jobj = super().to_partial_json()
jobj.pop('keyAuthorization', None)
return jobj
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/acme/client.py
new/acme-1.15.0/acme/client.py
--- old/acme-1.14.0/acme/client.py 2021-04-06 19:17:00.000000000 +0200
+++ new/acme-1.15.0/acme/client.py 2021-05-04 20:48:08.000000000 +0200
@@ -253,7 +253,7 @@
if isinstance(directory, str):
directory = messages.Directory.from_json(
net.get(directory).json())
- super(Client, self).__init__(directory=directory,
+ super().__init__(directory=directory,
net=net, acme_version=1)
def register(self, new_reg=None):
@@ -577,7 +577,7 @@
:param .messages.Directory directory: Directory Resource
:param .ClientNetwork net: Client network.
"""
- super(ClientV2, self).__init__(directory=directory,
+ super().__init__(directory=directory,
net=net, acme_version=2)
def new_account(self, new_account):
@@ -627,7 +627,7 @@
"""
# https://github.com/certbot/certbot/issues/6155
new_regr = self._get_v2_account(regr)
- return super(ClientV2, self).update_registration(new_regr, update)
+ return super().update_registration(new_regr, update)
def _get_v2_account(self, regr):
self.net.account = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/acme/errors.py
new/acme-1.15.0/acme/errors.py
--- old/acme-1.14.0/acme/errors.py 2021-04-06 19:17:00.000000000 +0200
+++ new/acme-1.15.0/acme/errors.py 2021-05-04 20:48:08.000000000 +0200
@@ -29,7 +29,7 @@
class BadNonce(NonceError):
"""Bad nonce error."""
def __init__(self, nonce, error, *args):
- super(BadNonce, self).__init__(*args)
+ super().__init__(*args)
self.nonce = nonce
self.error = error
@@ -48,7 +48,7 @@
"""
def __init__(self, response, *args):
- super(MissingNonce, self).__init__(*args)
+ super().__init__(*args)
self.response = response
def __str__(self):
@@ -72,7 +72,7 @@
def __init__(self, exhausted, updated):
self.exhausted = exhausted
self.updated = updated
- super(PollError, self).__init__()
+ super().__init__()
@property
def timeout(self):
@@ -90,7 +90,7 @@
"""
def __init__(self, failed_authzrs):
self.failed_authzrs = failed_authzrs
- super(ValidationError, self).__init__()
+ super().__init__()
class TimeoutError(Error): # pylint: disable=redefined-builtin
@@ -106,7 +106,7 @@
:param messages.Error error: The error provided by the server.
"""
self.error = error
- super(IssuanceError, self).__init__()
+ super().__init__()
class ConflictError(ClientError):
@@ -119,7 +119,7 @@
"""
def __init__(self, location):
self.location = location
- super(ConflictError, self).__init__()
+ super().__init__()
class WildcardUnsupportedError(Error):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/acme/fields.py
new/acme-1.15.0/acme/fields.py
--- old/acme-1.14.0/acme/fields.py 2021-04-06 19:17:00.000000000 +0200
+++ new/acme-1.15.0/acme/fields.py 2021-05-04 20:48:08.000000000 +0200
@@ -12,7 +12,7 @@
def __init__(self, json_name, value):
self.value = value
- super(Fixed, self).__init__(
+ super().__init__(
json_name=json_name, default=value, omitempty=False)
def decode(self, value):
@@ -53,7 +53,7 @@
def __init__(self, resource_type, *args, **kwargs):
self.resource_type = resource_type
- super(Resource, self).__init__(
+ super().__init__(
'resource', default=resource_type, *args, **kwargs)
def decode(self, value):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/acme/jws.py new/acme-1.15.0/acme/jws.py
--- old/acme-1.14.0/acme/jws.py 2021-04-06 19:17:00.000000000 +0200
+++ new/acme-1.15.0/acme/jws.py 2021-05-04 20:48:08.000000000 +0200
@@ -50,7 +50,7 @@
# Per ACME spec, jwk and kid are mutually exclusive, so only include a
# jwk field if kid is not provided.
include_jwk = kid is None
- return super(JWS, cls).sign(payload, key=key, alg=alg,
+ return super().sign(payload, key=key, alg=alg,
protect=frozenset(['nonce', 'url', 'kid',
'jwk', 'alg']),
nonce=nonce, url=url, kid=kid,
include_jwk=include_jwk)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/acme/messages.py
new/acme-1.15.0/acme/messages.py
--- old/acme-1.14.0/acme/messages.py 2021-04-06 19:17:00.000000000 +0200
+++ new/acme-1.15.0/acme/messages.py 2021-05-04 20:48:08.000000000 +0200
@@ -132,7 +132,7 @@
POSSIBLE_NAMES: Dict[str, '_Constant'] = NotImplemented
def __init__(self, name):
- super(_Constant, self).__init__()
+ super().__init__()
self.POSSIBLE_NAMES[name] = self # pylint:
disable=unsupported-assignment-operation
self.name = name
@@ -201,7 +201,7 @@
def __init__(self, **kwargs):
kwargs = {self._internal_name(k): v for k, v in kwargs.items()}
- super(Directory.Meta, self).__init__(**kwargs)
+ super().__init__(**kwargs)
@property
def terms_of_service(self):
@@ -211,7 +211,7 @@
def __iter__(self):
# When iterating over fields, use the external name
'terms_of_service' instead of
# the internal '_terms_of_service'.
- for name in super(Directory.Meta, self).__iter__():
+ for name in super().__iter__():
yield name[1:] if name == '_terms_of_service' else name
def _internal_name(self, name):
@@ -357,7 +357,7 @@
if 'contact' in kwargs:
# Avoid the __setattr__ used by jose.TypedJSONObjectWithFields
object.__setattr__(self, '_add_contact', True)
- super(Registration, self).__init__(**kwargs)
+ super().__init__(**kwargs)
def _filter_contact(self, prefix):
return tuple(
@@ -383,12 +383,12 @@
def to_partial_json(self):
"""Modify josepy.JSONDeserializable.to_partial_json()"""
- jobj = super(Registration, self).to_partial_json()
+ jobj = super().to_partial_json()
return self._add_contact_if_appropriate(jobj)
def fields_to_partial_json(self):
"""Modify josepy.JSONObjectWithFields.fields_to_partial_json()"""
- jobj = super(Registration, self).fields_to_partial_json()
+ jobj = super().fields_to_partial_json()
return self._add_contact_if_appropriate(jobj)
@property
@@ -460,19 +460,19 @@
def __init__(self, **kwargs):
kwargs = {self._internal_name(k): v for k, v in kwargs.items()}
- super(ChallengeBody, self).__init__(**kwargs)
+ super().__init__(**kwargs)
def encode(self, name):
- return super(ChallengeBody, self).encode(self._internal_name(name))
+ return super().encode(self._internal_name(name))
def to_partial_json(self):
- jobj = super(ChallengeBody, self).to_partial_json()
+ jobj = super().to_partial_json()
jobj.update(self.chall.to_partial_json())
return jobj
@classmethod
def fields_from_json(cls, jobj):
- jobj_fields = super(ChallengeBody, cls).fields_from_json(jobj)
+ jobj_fields = super().fields_from_json(jobj)
jobj_fields['chall'] = challenges.Challenge.from_json(jobj)
return jobj_fields
@@ -487,7 +487,7 @@
def __iter__(self):
# When iterating over fields, use the external name 'uri' instead of
# the internal '_uri'.
- for name in super(ChallengeBody, self).__iter__():
+ for name in super().__iter__():
yield name[1:] if name == '_uri' else name
def _internal_name(self, name):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/acme/mixins.py
new/acme-1.15.0/acme/mixins.py
--- old/acme-1.14.0/acme/mixins.py 2021-04-06 19:17:00.000000000 +0200
+++ new/acme-1.15.0/acme/mixins.py 2021-05-04 20:48:08.000000000 +0200
@@ -20,7 +20,7 @@
# Required for @property to operate properly. See comment above.
object.__setattr__(self, key, value)
else:
- super(VersionedLEACMEMixin, self).__setattr__(key, value) #
pragma: no cover
+ super().__setattr__(key, value) # pragma: no cover
class ResourceMixin(VersionedLEACMEMixin):
@@ -30,12 +30,12 @@
"""
def to_partial_json(self):
"""See josepy.JSONDeserializable.to_partial_json()"""
- return _safe_jobj_compliance(super(ResourceMixin, self),
+ return _safe_jobj_compliance(super(),
'to_partial_json', 'resource')
def fields_to_partial_json(self):
"""See josepy.JSONObjectWithFields.fields_to_partial_json()"""
- return _safe_jobj_compliance(super(ResourceMixin, self),
+ return _safe_jobj_compliance(super(),
'fields_to_partial_json', 'resource')
@@ -46,12 +46,12 @@
"""
def to_partial_json(self):
"""See josepy.JSONDeserializable.to_partial_json()"""
- return _safe_jobj_compliance(super(TypeMixin, self),
+ return _safe_jobj_compliance(super(),
'to_partial_json', 'type')
def fields_to_partial_json(self):
"""See josepy.JSONObjectWithFields.fields_to_partial_json()"""
- return _safe_jobj_compliance(super(TypeMixin, self),
+ return _safe_jobj_compliance(super(),
'fields_to_partial_json', 'type')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/acme.egg-info/PKG-INFO
new/acme-1.15.0/acme.egg-info/PKG-INFO
--- old/acme-1.14.0/acme.egg-info/PKG-INFO 2021-04-06 19:17:08.000000000
+0200
+++ new/acme-1.15.0/acme.egg-info/PKG-INFO 2021-05-04 20:48:42.000000000
+0200
@@ -1,10 +1,10 @@
Metadata-Version: 2.1
Name: acme
-Version: 1.14.0
+Version: 1.15.0
Summary: ACME protocol implementation in Python
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
-Author-email: client-...@letsencrypt.org
+Author-email: certbot-...@eff.org
License: Apache License 2.0
Description: UNKNOWN
Platform: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/setup.py new/acme-1.15.0/setup.py
--- old/acme-1.14.0/setup.py 2021-04-06 19:17:02.000000000 +0200
+++ new/acme-1.15.0/setup.py 2021-05-04 20:48:10.000000000 +0200
@@ -3,7 +3,7 @@
from setuptools import find_packages
from setuptools import setup
-version = '1.14.0'
+version = '1.15.0'
# Please update tox.ini when modifying dependency version requirements
install_requires = [
@@ -37,7 +37,7 @@
description='ACME protocol implementation in Python',
url='https://github.com/letsencrypt/letsencrypt',
author="Certbot Project",
- author_email='client-...@letsencrypt.org',
+ author_email='certbot-...@eff.org',
license='Apache License 2.0',
python_requires='>=3.6',
classifiers=[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/tests/challenges_test.py
new/acme-1.15.0/tests/challenges_test.py
--- old/acme-1.14.0/tests/challenges_test.py 2021-04-06 19:17:00.000000000
+0200
+++ new/acme-1.15.0/tests/challenges_test.py 2021-05-04 20:48:08.000000000
+0200
@@ -292,7 +292,7 @@
def test_gen_verify_cert_gen_key(self):
cert, key = self.response.gen_cert(self.domain)
- self.assertTrue(isinstance(key, OpenSSL.crypto.PKey))
+ self.assertIsInstance(key, OpenSSL.crypto.PKey)
self.assertTrue(self.response.verify_cert(self.domain, cert))
def test_verify_bad_cert(self):
@@ -431,7 +431,7 @@
mock_gen.return_value = mock.sentinel.validation
response = self.msg.gen_response(KEY)
from acme.challenges import DNSResponse
- self.assertTrue(isinstance(response, DNSResponse))
+ self.assertIsInstance(response, DNSResponse)
self.assertEqual(response.validation, mock.sentinel.validation)
def test_validation_domain_name(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/tests/client_test.py
new/acme-1.15.0/tests/client_test.py
--- old/acme-1.14.0/tests/client_test.py 2021-04-06 19:17:00.000000000
+0200
+++ new/acme-1.15.0/tests/client_test.py 2021-05-04 20:48:08.000000000
+0200
@@ -90,7 +90,7 @@
"""Tests for acme.client.BackwardsCompatibleClientV2."""
def setUp(self):
- super(BackwardsCompatibleClientV2Test, self).setUp()
+ super().setUp()
# contains a loaded cert
self.certr = messages.CertificateResource(
body=messages_test.CERT)
@@ -319,7 +319,7 @@
"""Tests for acme.client.Client."""
def setUp(self):
- super(ClientTest, self).setUp()
+ super().setUp()
self.directory = DIRECTORY_V1
@@ -604,8 +604,8 @@
# make sure that max_attempts is per-authorization, rather
# than global
max_attempts=max(len(authzrs[0].retries), len(authzrs[1].retries)))
- self.assertTrue(cert[0] is csr)
- self.assertTrue(cert[1] is updated_authzrs)
+ self.assertIs(cert[0], csr)
+ self.assertIs(cert[1], updated_authzrs)
self.assertEqual(updated_authzrs[0].uri, 'a...')
self.assertEqual(updated_authzrs[1].uri, 'b.')
self.assertEqual(updated_authzrs[0].times, [
@@ -641,7 +641,7 @@
authzr = self.client.deactivate_authorization(self.authzr)
self.assertEqual(authzb, authzr.body)
self.assertEqual(self.client.net.post.call_count, 1)
- self.assertTrue(self.authzr.uri in self.net.post.call_args_list[0][0])
+ self.assertIn(self.authzr.uri, self.net.post.call_args_list[0][0])
def test_check_cert(self):
self.response.headers['Location'] = self.certr.uri
@@ -700,7 +700,7 @@
def test_revocation_payload(self):
obj = messages.Revocation(certificate=self.certr.body, reason=self.rsn)
- self.assertTrue('reason' in obj.to_partial_json().keys())
+ self.assertIn('reason', obj.to_partial_json().keys())
self.assertEqual(self.rsn, obj.to_partial_json()['reason'])
def test_revoke_bad_status_raises_error(self):
@@ -716,7 +716,7 @@
"""Tests for acme.client.ClientV2."""
def setUp(self):
- super(ClientV2Test, self).setUp()
+ super().setUp()
self.directory = DIRECTORY_V2
@@ -877,9 +877,9 @@
self.response.headers['Location'] = self.regr.uri
self.response.json.return_value = self.regr.body.to_json()
self.assertEqual(self.regr, self.client.update_registration(self.regr))
- self.assertNotEqual(self.client.net.account, None)
+ self.assertIsNotNone(self.client.net.account)
self.assertEqual(self.client.net.post.call_count, 2)
- self.assertTrue(DIRECTORY_V2.newAccount in
self.net.post.call_args_list[0][0])
+ self.assertIn(DIRECTORY_V2.newAccount,
self.net.post.call_args_list[0][0])
self.response.json.return_value = self.regr.body.update(
contact=()).to_json()
@@ -943,7 +943,7 @@
self.response.links = {}
def test_init(self):
- self.assertTrue(self.net.verify_ssl is self.verify_ssl)
+ self.assertIs(self.net.verify_ssl, self.verify_ssl)
def test_wrap_in_jws(self):
# pylint: disable=protected-access
@@ -1185,7 +1185,7 @@
def send_request(*args, **kwargs):
# pylint: disable=unused-argument,missing-docstring
- self.assertFalse("new_nonce_url" in kwargs)
+ self.assertNotIn("new_nonce_url", kwargs)
method = args[0]
uri = args[1]
if method == 'HEAD' and uri != "new_nonce_uri":
@@ -1330,7 +1330,7 @@
from acme.client import ClientNetwork
net = ClientNetwork(key=None, alg=None,
source_address=self.source_address)
for adapter in net.session.adapters.values():
- self.assertTrue(self.source_address in adapter.source_address)
+ self.assertIn(self.source_address, adapter.source_address)
def test_behavior_assumption(self):
"""This is a test that guardrails the HTTPAdapter behavior so that if
the default for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/tests/crypto_util_test.py
new/acme-1.15.0/tests/crypto_util_test.py
--- old/acme-1.14.0/tests/crypto_util_test.py 2021-04-06 19:17:00.000000000
+0200
+++ new/acme-1.15.0/tests/crypto_util_test.py 2021-05-04 20:48:08.000000000
+0200
@@ -191,7 +191,7 @@
for _ in range(self.cert_count):
cert = gen_ss_cert(self.key, ['dummy'], force_san=True)
self.serial_num.append(cert.get_serial_number())
- self.assertTrue(len(set(self.serial_num)) > 1)
+ self.assertGreater(len(set(self.serial_num)), 1)
class MakeCSRTest(unittest.TestCase):
"""Test for standalone functions."""
@@ -206,8 +206,8 @@
def test_make_csr(self):
csr_pem = self._call_with_key(["a.example", "b.example"])
- self.assertTrue(b'--BEGIN CERTIFICATE REQUEST--' in csr_pem)
- self.assertTrue(b'--END CERTIFICATE REQUEST--' in csr_pem)
+ self.assertIn(b'--BEGIN CERTIFICATE REQUEST--', csr_pem)
+ self.assertIn(b'--END CERTIFICATE REQUEST--', csr_pem)
csr = OpenSSL.crypto.load_certificate_request(
OpenSSL.crypto.FILETYPE_PEM, csr_pem)
# In pyopenssl 0.13 (used with TOXENV=py27-oldest), csr objects don't
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/tests/errors_test.py
new/acme-1.15.0/tests/errors_test.py
--- old/acme-1.14.0/tests/errors_test.py 2021-04-06 19:17:00.000000000
+0200
+++ new/acme-1.15.0/tests/errors_test.py 2021-05-04 20:48:08.000000000
+0200
@@ -24,8 +24,8 @@
self.error = MissingNonce(self.response)
def test_str(self):
- self.assertTrue("FOO" in str(self.error))
- self.assertTrue("{}" in str(self.error))
+ self.assertIn("FOO", str(self.error))
+ self.assertIn("{}", str(self.error))
class PollErrorTest(unittest.TestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/tests/jws_test.py
new/acme-1.15.0/tests/jws_test.py
--- old/acme-1.14.0/tests/jws_test.py 2021-04-06 19:17:00.000000000 +0200
+++ new/acme-1.15.0/tests/jws_test.py 2021-05-04 20:48:08.000000000 +0200
@@ -48,7 +48,7 @@
self.assertEqual(jws.signature.combined.nonce, self.nonce)
self.assertEqual(jws.signature.combined.url, self.url)
self.assertEqual(jws.signature.combined.kid, self.kid)
- self.assertEqual(jws.signature.combined.jwk, None)
+ self.assertIsNone(jws.signature.combined.jwk)
# TODO: check that nonce is in protected header
self.assertEqual(jws, JWS.from_json(jws.to_json()))
@@ -58,7 +58,7 @@
jws = JWS.sign(payload=b'foo', key=self.privkey,
alg=jose.RS256, nonce=self.nonce,
url=self.url)
- self.assertEqual(jws.signature.combined.kid, None)
+ self.assertIsNone(jws.signature.combined.kid)
self.assertEqual(jws.signature.combined.jwk, self.pubkey)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/acme-1.14.0/tests/messages_test.py
new/acme-1.15.0/tests/messages_test.py
--- old/acme-1.14.0/tests/messages_test.py 2021-04-06 19:17:00.000000000
+0200
+++ new/acme-1.15.0/tests/messages_test.py 2021-05-04 20:48:08.000000000
+0200
@@ -41,13 +41,13 @@
def test_description(self):
self.assertEqual('The request message was malformed',
self.error.description)
- self.assertTrue(self.error_custom.description is None)
+ self.assertIsNone(self.error_custom.description)
def test_code(self):
from acme.messages import Error
self.assertEqual('malformed', self.error.code)
- self.assertEqual(None, self.error_custom.code)
- self.assertEqual(None, Error().code)
+ self.assertIsNone(self.error_custom.code)
+ self.assertIsNone(Error().code)
def test_is_acme_error(self):
from acme.messages import is_acme_error, Error
@@ -260,10 +260,10 @@
self.assertEqual(empty_new_reg.contact, ())
self.assertEqual(new_reg_with_contact.contact, ())
- self.assertTrue('contact' not in empty_new_reg.to_partial_json())
- self.assertTrue('contact' not in
empty_new_reg.fields_to_partial_json())
- self.assertTrue('contact' in new_reg_with_contact.to_partial_json())
- self.assertTrue('contact' in
new_reg_with_contact.fields_to_partial_json())
+ self.assertNotIn('contact', empty_new_reg.to_partial_json())
+ self.assertNotIn('contact', empty_new_reg.fields_to_partial_json())
+ self.assertIn('contact', new_reg_with_contact.to_partial_json())
+ self.assertIn('contact', new_reg_with_contact.fields_to_partial_json())
class UpdateRegistrationTest(unittest.TestCase):
@@ -406,7 +406,7 @@
authzr = AuthorizationResource(
uri=mock.sentinel.uri,
body=mock.sentinel.body)
- self.assertTrue(isinstance(authzr, jose.JSONDeSerializable))
+ self.assertIsInstance(authzr, jose.JSONDeSerializable)
class CertificateRequestTest(unittest.TestCase):
@@ -417,7 +417,7 @@
self.req = CertificateRequest(csr=CSR)
def test_json_de_serializable(self):
- self.assertTrue(isinstance(self.req, jose.JSONDeSerializable))
+ self.assertIsInstance(self.req, jose.JSONDeSerializable)
from acme.messages import CertificateRequest
self.assertEqual(
self.req, CertificateRequest.from_json(self.req.to_json()))
@@ -433,7 +433,7 @@
cert_chain_uri=mock.sentinel.cert_chain_uri)
def test_json_de_serializable(self):
- self.assertTrue(isinstance(self.certr, jose.JSONDeSerializable))
+ self.assertIsInstance(self.certr, jose.JSONDeSerializable)
from acme.messages import CertificateResource
self.assertEqual(
self.certr, CertificateResource.from_json(self.certr.to_json()))
