Rename file to attend TODO comment

server_environment/__init__.py

@@ -18,10 +18,5 @@
 #
 ##############################################################################
 from . import models
-# TODO when migrating to 12, fix the import of serv_config by renaming the
+from . import server_env
-# file?
+from .server_env import serv_config, setboolean
-# Add an alias to access to the 'serv_config' module as it is shadowed
-# in the following line by an import of a variable with the same name.
-# We can't change the import of serv_config for backward compatibility.
-from . import serv_config as server_env
-from .serv_config import serv_config, setboolean

server_environment/models/server_env_mixin.py

@@ -8,7 +8,7 @@ from functools import partialmethod
 from lxml import etree
 
 from odoo import api, fields, models
-from ..serv_config import serv_config
+from ..server_env import serv_config
 
 _logger = logging.getLogger(__name__)