Update and run isort (#9573)

I want to use isort as part of https://github.com/certbot/certbot/issues/9572 because I want to do it programmatically, however, I felt like the config needed to be tweaked a bit due to it not understanding what is and is not our own code.

This PR updates the isort config so it recognizes our own modules and runs `isort .` from the root of the repo to update everything.

* update isort config

* run "isort ."

certbot-apache/certbot_apache/_internal/augeasparser.py

@@ -74,15 +74,14 @@ from typing import Set
 from typing import Tuple
 from typing import Union
 
+from certbot import errors
+from certbot.compat import os
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import assertions
 from certbot_apache._internal import interfaces
 from certbot_apache._internal import parser
 from certbot_apache._internal import parsernode_util as util
 
-from certbot import errors
-from certbot.compat import os
-
 
 class AugeasParserNode(interfaces.ParserNode):
     """ Augeas implementation of ParserNode interface """

certbot-apache/certbot_apache/_internal/configurator.py

@@ -21,16 +21,6 @@ from typing import Tuple
 from typing import Type
 from typing import Union
 
-from certbot_apache._internal import apache_util
-from certbot_apache._internal import assertions
-from certbot_apache._internal import constants
-from certbot_apache._internal import display_ops
-from certbot_apache._internal import dualparser
-from certbot_apache._internal import http_01
-from certbot_apache._internal import obj
-from certbot_apache._internal import parser
-from certbot_apache._internal.apacheparser import ApacheBlockNode
-
 from acme import challenges
 from certbot import achallenges
 from certbot import errors
@@ -42,6 +32,15 @@ from certbot.interfaces import RenewableCert
 from certbot.plugins import common
 from certbot.plugins.enhancements import AutoHSTSEnhancement
 from certbot.plugins.util import path_surgery
+from certbot_apache._internal import apache_util
+from certbot_apache._internal import assertions
+from certbot_apache._internal import constants
+from certbot_apache._internal import display_ops
+from certbot_apache._internal import dualparser
+from certbot_apache._internal import http_01
+from certbot_apache._internal import obj
+from certbot_apache._internal import parser
+from certbot_apache._internal.apacheparser import ApacheBlockNode
 
 try:
     import apacheconfig

certbot-apache/certbot_apache/_internal/display_ops.py

@@ -6,11 +6,10 @@ from typing import Optional
 from typing import Sequence
 from typing import Tuple
 
-from certbot_apache._internal.obj import VirtualHost
-
 from certbot import errors
 from certbot.compat import os
 from certbot.display import util as display_util
+from certbot_apache._internal.obj import VirtualHost
 
 logger = logging.getLogger(__name__)
 

certbot-apache/certbot_apache/_internal/entrypoint.py

@@ -2,6 +2,7 @@
 from typing import Dict
 from typing import Type
 
+from certbot import util
 from certbot_apache._internal import configurator
 from certbot_apache._internal import override_arch
 from certbot_apache._internal import override_centos
@@ -12,8 +13,6 @@ from certbot_apache._internal import override_gentoo
 from certbot_apache._internal import override_suse
 from certbot_apache._internal import override_void
 
-from certbot import util
-
 OVERRIDE_CLASSES: Dict[str, Type[configurator.ApacheConfigurator]] = {
     "arch": override_arch.ArchConfigurator,
     "cloudlinux": override_centos.CentOSConfigurator,

certbot-apache/certbot_apache/_internal/http_01.py

@@ -5,15 +5,14 @@ from typing import List
 from typing import Set
 from typing import TYPE_CHECKING
 
-from certbot_apache._internal.obj import VirtualHost
-from certbot_apache._internal.parser import get_aug_path
-
 from acme.challenges import KeyAuthorizationChallengeResponse
 from certbot import errors
 from certbot.achallenges import KeyAuthorizationAnnotatedChallenge
 from certbot.compat import filesystem
 from certbot.compat import os
 from certbot.plugins import common
+from certbot_apache._internal.obj import VirtualHost
+from certbot_apache._internal.parser import get_aug_path
 
 if TYPE_CHECKING:
     from certbot_apache._internal.configurator import ApacheConfigurator  # pragma: no cover

certbot-apache/certbot_apache/_internal/obj.py

@@ -7,12 +7,11 @@ from typing import Pattern
 from typing import Set
 from typing import Union
 
+from certbot.plugins import common
 from certbot_apache._internal.apacheparser import ApacheBlockNode
 from certbot_apache._internal.augeasparser import AugeasBlockNode
 from certbot_apache._internal.dualparser import DualBlockNode
 
-from certbot.plugins import common
-
 
 class Addr(common.Addr):
     """Represents an Apache address."""

certbot-apache/certbot_apache/_internal/override_centos.py

@@ -2,14 +2,13 @@
 import logging
 from typing import Any
 
+from certbot import errors
+from certbot import util
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import configurator
 from certbot_apache._internal import parser
 from certbot_apache._internal.configurator import OsOptions
 
-from certbot import errors
-from certbot import util
-
 logger = logging.getLogger(__name__)
 
 

certbot-apache/certbot_apache/_internal/override_debian.py

@@ -1,15 +1,14 @@
 """ Distribution specific override class for Debian family (Ubuntu/Debian) """
 import logging
 
-from certbot_apache._internal import apache_util
-from certbot_apache._internal import configurator
-from certbot_apache._internal.configurator import OsOptions
-from certbot_apache._internal.obj import VirtualHost
-
 from certbot import errors
 from certbot import util
 from certbot.compat import filesystem
 from certbot.compat import os
+from certbot_apache._internal import apache_util
+from certbot_apache._internal import configurator
+from certbot_apache._internal.configurator import OsOptions
+from certbot_apache._internal.obj import VirtualHost
 
 logger = logging.getLogger(__name__)
 

certbot-apache/certbot_apache/_internal/override_fedora.py

@@ -1,14 +1,13 @@
 """ Distribution specific override class for Fedora 29+ """
 from typing import Any
 
+from certbot import errors
+from certbot import util
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import configurator
 from certbot_apache._internal import parser
 from certbot_apache._internal.configurator import OsOptions
 
-from certbot import errors
-from certbot import util
-
 
 class FedoraConfigurator(configurator.ApacheConfigurator):
     """Fedora 29+ specific ApacheConfigurator override class"""

certbot-apache/certbot_apache/_internal/parser.py

@@ -15,11 +15,10 @@ from typing import Tuple
 from typing import TYPE_CHECKING
 from typing import Union
 
-from certbot_apache._internal import apache_util
-from certbot_apache._internal import constants
-
 from certbot import errors
 from certbot.compat import os
+from certbot_apache._internal import apache_util
+from certbot_apache._internal import constants
 
 if TYPE_CHECKING:
     from certbot_apache._internal.configurator import ApacheConfigurator  # pragma: no cover