refactor(model): move all namedtupples to model

Refs: #131

Author: piraz

automatoes/acme.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-#
-# Copyright 2019-2020 Flavio Garcia
+# Copyright 2019-2025 Flavio Garcia
 # Copyright 2016-2017 Veeti Paananen under MIT License
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,12 +17,13 @@
 ACME API client.
 """
 
-from . import get_version
-from .crypto import (export_certificate_for_acme, generate_header, jose_b64,
-                     sign_request, sign_request_v2)
-from .errors import AccountAlreadyExistsError, AcmeError
-from .model import Order, Challenge
-from collections import namedtuple
+from automatoes import get_version
+from automatoes.crypto import (export_certificate_for_acme, generate_header,
+                               jose_b64, sign_request, sign_request_v2)
+from automatoes.errors import AccountAlreadyExistsError, AcmeError
+from automatoes.model import (Challenge, IssuanceResult,
+                              NewAuthorizationResult, Order,
+                              RegistrationResult)
 import copy
 import datetime
 import hashlib
@@ -241,12 +240,6 @@ def path(self, path):
         return urljoin(self.url, path)
 
 
-RegistrationResult = namedtuple("RegistrationResult", "contents uri terms")
-NewAuthorizationResult = namedtuple("NewAuthorizationResult", "contents uri")
-IssuanceResult = namedtuple("IssuanceResult",
-                            "certificate location intermediate")
-
-
 class AcmeV2(Acme):
 
     def __init__(self, url, account, directory="directory", verify=None,

automatoes/model.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-#
-# Copyright 2019-2022 Flávio Gonçalves Garcia
+# Copyright 2019-2025 Flavio Garcia
 # Copyright 2016-2017 Veeti Paananen under MIT License
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +18,7 @@
 
 from .crypto import (generate_jwk_thumbprint, load_private_key,
                      export_private_key)
+from collections import namedtuple
 from datetime import datetime
 
 
@@ -141,3 +140,9 @@ def deserialize(data):
             return order
         except (TypeError, ValueError, AttributeError) as e:
             raise IOError("Invalid account structure: {}".format(e))
+
+
+RegistrationResult = namedtuple("RegistrationResult", "contents uri terms")
+NewAuthorizationResult = namedtuple("NewAuthorizationResult", "contents uri")
+IssuanceResult = namedtuple("IssuanceResult",
+                            "certificate location intermediate")