Modifications needed for merging to master

certbot-apache/certbot_apache/_internal/apacheparser.py

@@ -1,8 +1,8 @@
 """ apacheconfig implementation of the ParserNode interfaces """
 
-from certbot_apache import assertions
-from certbot_apache import interfaces
-from certbot_apache import parsernode_util as util
+from certbot_apache._internal import assertions
+from certbot_apache._internal import interfaces
+from certbot_apache._internal import parsernode_util as util
 
 
 class ApacheParserNode(interfaces.ParserNode):
@@ -73,9 +73,9 @@ class ApacheDirectiveNode(ApacheParserNode):
                     self.metadata == other.metadata)
         return False
 
-    def set_parameters(self, parameters):
+    def set_parameters(self, _parameters):
         """Sets the parameters for DirectiveNode"""
-        pass
+        return
 
 
 class ApacheBlockNode(ApacheDirectiveNode):
@@ -153,7 +153,7 @@ class ApacheBlockNode(ApacheDirectiveNode):
 
     def delete_child(self, child):  # pragma: no cover
         """Deletes a ParserNode from the sequence of children"""
-        pass
+        return
 
     def unsaved_files(self):  # pragma: no cover
         """Returns a list of unsaved filepaths"""

certbot-apache/certbot_apache/_internal/assertions.py

@@ -1,7 +1,7 @@
 """Dual parser node assertions"""
 import fnmatch
 
-from certbot_apache import interfaces
+from certbot_apache._internal import interfaces
 
 
 PASS = "CERTBOT_PASS_ASSERT"
@@ -36,8 +36,8 @@ def assertEqualComment(first, second): # pragma: no cover
     assert isinstance(first, interfaces.CommentNode)
     assert isinstance(second, interfaces.CommentNode)
 
-    if not isPass(first.comment) and not isPass(second.comment):
-        assert first.comment == second.comment
+    if not isPass(first.comment) and not isPass(second.comment):  # type: ignore
+        assert first.comment == second.comment  # type: ignore
 
 def _assertEqualDirectiveComponents(first, second): # pragma: no cover
     """ Handles assertion for instance variables for DirectiveNode and BlockNode"""

certbot-apache/certbot_apache/_internal/augeasparser.py

@@ -68,11 +68,11 @@ from acme.magic_typing import Set  # pylint: disable=unused-import, no-name-in-m
 from certbot import errors
 from certbot.compat import os
 
-from certbot_apache import apache_util
-from certbot_apache import assertions
-from certbot_apache import interfaces
-from certbot_apache import parser
-from certbot_apache import parsernode_util as util
+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
 
 
 class AugeasParserNode(interfaces.ParserNode):

certbot-apache/certbot_apache/_internal/dualparser.py

@@ -1,7 +1,7 @@
 """ Dual ParserNode implementation """
-from certbot_apache import assertions
-from certbot_apache import augeasparser
-from certbot_apache import apacheparser
+from certbot_apache._internal import assertions
+from certbot_apache._internal import augeasparser
+from certbot_apache._internal import apacheparser
 
 
 class DualNodeBase(object):