From 6a8d78c5a3d4bcf2f7417ef19ed59f634721c2cb Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Mon, 27 Nov 2017 15:09:51 -0800 Subject: [PATCH] Remove separate NewAccount. --- acme/acme/client.py | 5 ++--- acme/acme/messages.py | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index b8b145720..c3a603b7e 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -92,18 +92,17 @@ class Client(object): # pylint: disable=too-many-instance-attributes def register(self, new_reg=None): """Register. - :param .NewRegistration or .NewAccount new_reg: + :param .NewRegistration new_reg: :returns: Registration Resource. :rtype: `.RegistrationResource` """ + new_reg = messages.NewRegistration() if new_reg is None else new_reg if self.acme_version == 2: url = self.directory.new_account - new_reg = messages.NewAccount() if new_reg is None else new_reg else: url = self.directory.new_reg - new_reg = messages.NewRegistration() if new_reg is None else new_reg response = self.net.post(url, new_reg) # TODO: handle errors diff --git a/acme/acme/messages.py b/acme/acme/messages.py index 2c1a198eb..4b4fa5003 100644 --- a/acme/acme/messages.py +++ b/acme/acme/messages.py @@ -288,13 +288,6 @@ class NewRegistration(Registration): resource = fields.Resource(resource_type) -@Directory.register -class NewAccount(Registration): - """New account.""" - resource_type = 'new-account' # not used - resource = fields.Resource(resource_type) - - class UpdateRegistration(Registration): """Update registration.""" resource_type = 'reg'