mirror of
https://github.com/certbot/certbot.git
synced 2026-08-02 19:42:02 +02:00
Remove import fallback for collections.abc (#8674)
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
"""ACME protocol messages."""
|
"""ACME protocol messages."""
|
||||||
import json
|
import json
|
||||||
|
from collections.abc import Hashable
|
||||||
|
|
||||||
import josepy as jose
|
import josepy as jose
|
||||||
|
|
||||||
@@ -10,13 +11,6 @@ from acme import jws
|
|||||||
from acme import util
|
from acme import util
|
||||||
from acme.mixins import ResourceMixin
|
from acme.mixins import ResourceMixin
|
||||||
|
|
||||||
try:
|
|
||||||
from collections.abc import Hashable
|
|
||||||
except ImportError: # pragma: no cover
|
|
||||||
from collections import Hashable
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
OLD_ERROR_PREFIX = "urn:acme:error:"
|
OLD_ERROR_PREFIX = "urn:acme:error:"
|
||||||
ERROR_PREFIX = "urn:ietf:params:acme:error:"
|
ERROR_PREFIX = "urn:ietf:params:acme:error:"
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import collections
|
|||||||
import itertools
|
import itertools
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
|
from collections.abc import Mapping
|
||||||
|
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
import zope.interface
|
import zope.interface
|
||||||
@@ -14,12 +15,6 @@ from certbot import interfaces
|
|||||||
from certbot._internal import constants
|
from certbot._internal import constants
|
||||||
from certbot.compat import os
|
from certbot.compat import os
|
||||||
|
|
||||||
try:
|
|
||||||
# Python 3.3+
|
|
||||||
from collections.abc import Mapping
|
|
||||||
except ImportError: # pragma: no cover
|
|
||||||
from collections import Mapping
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
PREFIX_FREE_DISTRIBUTIONS = [
|
PREFIX_FREE_DISTRIBUTIONS = [
|
||||||
|
|||||||
Reference in New Issue
Block a user