From 7515a9800cf83a96dcb50326fba24468f2f96ca6 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Wed, 4 Feb 2015 20:24:15 +0000 Subject: [PATCH] Unify quotes in acme --- letsencrypt/acme/jose.py | 16 ++++++++-------- letsencrypt/acme/jose_test.py | 2 +- letsencrypt/acme/messages_test.py | 16 ++++++++-------- letsencrypt/acme/other.py | 18 +++++++++--------- letsencrypt/acme/other_test.py | 3 ++- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/letsencrypt/acme/jose.py b/letsencrypt/acme/jose.py index da66b5b04..0ed11cdb4 100644 --- a/letsencrypt/acme/jose.py +++ b/letsencrypt/acme/jose.py @@ -10,7 +10,7 @@ from letsencrypt.acme import interfaces def _leading_zeros(arg): if len(arg) % 2: - return "0" + arg + return '0' + arg return arg @@ -44,7 +44,7 @@ class JWK(object): def _encode_param(cls, param): """Encode numeric key parameter.""" return b64encode(binascii.unhexlify( - _leading_zeros(hex(param)[2:].rstrip("L")))) + _leading_zeros(hex(param)[2:].rstrip('L')))) @classmethod def _decode_param(cls, param): @@ -54,18 +54,18 @@ class JWK(object): def to_json(self): """Serialize to JSON.""" return { - "kty": "RSA", # TODO - "n": self._encode_param(self.key.n), - "e": self._encode_param(self.key.e), + 'kty': 'RSA', # TODO + 'n': self._encode_param(self.key.n), + 'e': self._encode_param(self.key.e), } @classmethod def from_json(cls, json_object): """Deserialize from JSON.""" - assert "RSA" == json_object["kty"] # TODO + assert 'RSA' == json_object['kty'] # TODO return cls(Crypto.PublicKey.RSA.construct( - (cls._decode_param(json_object["n"]), - cls._decode_param(json_object["e"])))) + (cls._decode_param(json_object['n']), + cls._decode_param(json_object['e'])))) # https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-37#appendix-C diff --git a/letsencrypt/acme/jose_test.py b/letsencrypt/acme/jose_test.py index a18ad8700..343731a6f 100644 --- a/letsencrypt/acme/jose_test.py +++ b/letsencrypt/acme/jose_test.py @@ -123,5 +123,5 @@ class B64DecodeTest(unittest.TestCase): self.assertRaises(TypeError, self._call, object()) -if __name__ == "__main__": +if __name__ == '__main__': unittest.main() diff --git a/letsencrypt/acme/messages_test.py b/letsencrypt/acme/messages_test.py index 531ff7048..17971c7d5 100644 --- a/letsencrypt/acme/messages_test.py +++ b/letsencrypt/acme/messages_test.py @@ -38,22 +38,22 @@ class MessageTest(unittest.TestCase): def test_validate_unknown_type_fails(self): self.assertRaises(errors.UnrecognnizedMessageTypeError, - self._validate, {"type": "bar"}) + self._validate, {'type': 'bar'}) def test_validate_unregistered_type_fails(self): self.assertRaises(errors.UnrecognnizedMessageTypeError, - self._validate, {"type": "foo"}) + self._validate, {'type': 'foo'}) - @mock.patch("letsencrypt.acme.messages.Message.TYPES") + @mock.patch('letsencrypt.acme.messages.Message.TYPES') def test_validate_invalid_fails(self, types): - types.__getitem__.side_effect = lambda x: {"foo": "bar"}[x] + types.__getitem__.side_effect = lambda x: {'foo': 'bar'}[x] self.assertRaises(errors.SchemaValidationError, - self._validate, {"type": "foo", "price": "asd"}) + self._validate, {'type': 'foo', 'price': 'asd'}) - @mock.patch("letsencrypt.acme.messages.Message.TYPES") + @mock.patch('letsencrypt.acme.messages.Message.TYPES') def test_validate_valid_returns_cls(self, types): - types.__getitem__.side_effect = lambda x: {"foo": "bar"}[x] - self.assertEqual(self._validate({"type": "foo"}), "bar") + types.__getitem__.side_effect = lambda x: {'foo': 'bar'}[x] + self.assertEqual(self._validate({'type': 'foo'}), 'bar') class ChallengeRequestTest(unittest.TestCase): diff --git a/letsencrypt/acme/other.py b/letsencrypt/acme/other.py index 7520bdde2..fbc848acd 100644 --- a/letsencrypt/acme/other.py +++ b/letsencrypt/acme/other.py @@ -62,9 +62,9 @@ class Signature(object): hashed = Crypto.Hash.SHA256.new(msg_with_nonce) sig = Crypto.Signature.PKCS1_v1_5.new(key).sign(hashed) - logging.debug("%s signed as %s", msg_with_nonce, sig) + logging.debug('%s signed as %s', msg_with_nonce, sig) - return cls("RS256", sig, nonce, jose.JWK(key)) + return cls('RS256', sig, nonce, jose.JWK(key)) def __eq__(self, other): if isinstance(other, Signature): @@ -85,15 +85,15 @@ class Signature(object): def to_json(self): """Seriliaze to JSON.""" return { - "alg": self.alg, - "sig": jose.b64encode(self.sig), - "nonce": jose.b64encode(self.nonce), - "jwk": self.jwk, + 'alg': self.alg, + 'sig': jose.b64encode(self.sig), + 'nonce': jose.b64encode(self.nonce), + 'jwk': self.jwk, } @classmethod def from_json(cls, json_object): """Deserialize from JSON.""" - return cls(json_object["alg"], jose.b64decode(json_object["sig"]), - jose.b64decode(json_object["nonce"]), - jose.JWK.from_json(json_object["jwk"])) + return cls(json_object['alg'], jose.b64decode(json_object['sig']), + jose.b64decode(json_object['nonce']), + jose.JWK.from_json(json_object['jwk'])) diff --git a/letsencrypt/acme/other_test.py b/letsencrypt/acme/other_test.py index 811fb111b..7300a2009 100644 --- a/letsencrypt/acme/other_test.py +++ b/letsencrypt/acme/other_test.py @@ -52,5 +52,6 @@ class SigatureTest(unittest.TestCase): self.assertEqual(sig.alg, self.alg) self.assertEqual(sig.jwk, self.jwk) -if __name__ == "__main__": + +if __name__ == '__main__': unittest.main()