upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 07:12:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use camelCase for directory and other identifiers.

Browse source
This commit is contained in:
Jacob Hoffman-Andrews 2017-12-14 13:26:04 -08:00
parent 15a8a1e7d8
commit ac956eb08d
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acme/acme/client.py
View file

@ -356,7 +356,7 @@ class Client(object): # pylint: disable=too-many-instance-attributes
(authz.body.identifier.value, chall.error))
raise Exception("failed authorization: %s" % authz.body)
latest = self._order_resource_from_response(self.net.get(orderr.uri), uri=orderr.uri)
self.net.post(latest.body.finalize_url, messages.CertificateRequest(csr=orderr.csr))
self.net.post(latest.body.finalize, messages.CertificateRequest(csr=orderr.csr))
while datetime.datetime.now() < deadline:
time.sleep(1)
latest = self._order_resource_from_response(self.net.get(orderr.uri), uri=orderr.uri)

19
acme/acme/messages.py
View file

@ -1,5 +1,6 @@
"""ACME protocol messages."""
import collections
import re
import six
from acme import challenges
@ -170,9 +171,9 @@ class Directory(jose.JSONDeSerializable):
class Meta(jose.JSONObjectWithFields):
"""Directory Meta."""
terms_of_service = jose.Field('terms-of-service', omitempty=True)
terms_of_service = jose.Field('termsOfService', omitempty=True)
website = jose.Field('website', omitempty=True)
caa_identities = jose.Field('caa-identities', omitempty=True)
caa_identities = jose.Field('caaIdentities', omitempty=True)
@classmethod
def _canon_key(cls, key):
@ -192,11 +193,19 @@ class Directory(jose.JSONDeSerializable):
# not clear on that
self._jobj = canon_jobj
def _camelCase(self, name):
"""Convert a snake_case name to camelCase."""
return re.sub('_([a-z])', lambda x: x.group(1).upper(), name)
def __getattr__(self, name):
try:
return self[name.replace('_', '-')]
except KeyError as error:
raise AttributeError(str(error) + ': ' + name)
try:
print self._camelCase(name)
return self[self._camelCase(name)]
except KeyError as error:
raise AttributeError(str(error) + ': ' + name)
def __getitem__(self, name):
try:
@ -250,7 +259,7 @@ class Registration(ResourceBody):
contact = jose.Field('contact', omitempty=True, default=())
agreement = jose.Field('agreement', omitempty=True)
status = jose.Field('status', omitempty=True)
terms_of_service_agreed = jose.Field('terms-of-service-agreed', omitempty=True)
terms_of_service_agreed = jose.Field('termsOfServiceAgreed', omitempty=True)
phone_prefix = 'tel:'
email_prefix = 'mailto:'
@ -495,7 +504,7 @@ class Order(ResourceBody):
status = jose.Field('status', omitempty=True, default=None)
authorizations = jose.Field('authorizations', omitempty=True)
certificate = jose.Field('certificate', omitempty=True)
finalize_url = jose.Field('finalizeURL', omitempty=True)
finalize = jose.Field('finalize', omitempty=True)
expires = fields.RFC3339Field('expires', omitempty=True)
class OrderResource(ResourceWithURI):