Fix review comments: unused import, HTML path, docstring, test cleanup, lint

- Remove unused LINUX_OS_NAME import (_create_util.py)
- Fix static HTML path: use _dirpath instead of src_path in os.path.join
- Update _detect_python_version docstring to match implementation
- Fix duplicate string formatting argument (pylint W1308)
- Replace tempfile.mkdtemp()+shutil.rmtree() with TemporaryDirectory()

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: seligj95

src/azure-cli/azure/cli/command_modules/appservice/_create_util.py

@@ -15,8 +15,7 @@
 
 from ._constants import (NETCORE_RUNTIME_NAME, NODE_RUNTIME_NAME, ASPDOTNET_RUNTIME_NAME, STATIC_RUNTIME_NAME,
                          PYTHON_RUNTIME_NAME, LINUX_SKU_DEFAULT, OS_DEFAULT, DOTNET_RUNTIME_NAME,
-                         DOTNET_TARGET_FRAMEWORK_REGEX, GENERATE_RANDOM_APP_NAMES, DOTNET_REFERENCES_DIR_IN_ZIP,
-                         LINUX_OS_NAME)
+                         DOTNET_TARGET_FRAMEWORK_REGEX, GENERATE_RANDOM_APP_NAMES, DOTNET_REFERENCES_DIR_IN_ZIP)
 from .utils import get_resource_if_exists
 
 logger = get_logger(__name__)
@@ -172,7 +171,7 @@ def get_lang_from_content(src_path, html=False, is_linux=False):
             if fnmatch.fnmatch(file, "*.html") or fnmatch.fnmatch(file, "*.htm") or \
                     fnmatch.fnmatch(file, "*.shtml"):
                 if not static_html_file:
-                    static_html_file = os.path.join(src_path, file)
+                    static_html_file = os.path.join(_dirpath, file)
             if fnmatch.fnmatch(file, "*.csproj"):
                 package_netcore_file = os.path.join(src_path, file)
                 if not os.path.isfile(package_netcore_file):
@@ -294,7 +293,7 @@ def parse_node_version(file_path):
 
 
 def _detect_python_version(file_path):
-    """Detect Python version from runtime.txt, .python-version, or Dockerfile in the project directory."""
+    """Detect Python version from runtime.txt or .python-version in the project directory."""
     import re
     src_dir = os.path.dirname(file_path) if file_path else ''
     if not src_dir:
@@ -468,10 +467,10 @@ def validate_runtime_os_combo(language, version_used_create, os_name, stack_help
         match = stack_helper.resolve(runtime_version, is_linux)
         if not match:
             raise ValidationError(
-                "The runtime '{}' is not supported on {}. "
-                "Please check supported runtimes with: 'az webapp list-runtimes --os {}'.\n"
+                "The runtime '{}' is not supported on {os_name}. "
+                "Please check supported runtimes with: 'az webapp list-runtimes --os {os_name}'.\n"
                 "HINT: Try a different --os-type or --runtime value.".format(
-                    runtime_version, os_name, os_name))
+                    runtime_version, os_name=os_name))
 
 
 def get_plan_to_use(cmd, user, loc, sku, create_rg, resource_group_name, client, is_linux=False, plan=None):

src/azure-cli/azure/cli/command_modules/appservice/tests/latest/test_webapp_commands_thru_mock.py

@@ -650,54 +650,44 @@ class TestDetectOsFromSrc(unittest.TestCase):
     def test_python_detected_as_linux(self):
         from azure.cli.command_modules.appservice._create_util import detect_os_from_src
         import tempfile
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
-            f.write('flask\n')
-        result = detect_os_from_src(tmp)
-        self.assertEqual(result, "Linux")
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
+                f.write('flask\n')
+            result = detect_os_from_src(tmp)
+            self.assertEqual(result, "Linux")
 
     def test_node_detected_as_linux(self):
         from azure.cli.command_modules.appservice._create_util import detect_os_from_src
         import tempfile
         import json
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'package.json'), 'w') as f:
-            json.dump({"name": "test", "version": "1.0.0"}, f)
-        result = detect_os_from_src(tmp)
-        self.assertEqual(result, "Linux")
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'package.json'), 'w') as f:
+                json.dump({"name": "test", "version": "1.0.0"}, f)
+            result = detect_os_from_src(tmp)
+            self.assertEqual(result, "Linux")
 
     def test_html_detected_as_linux(self):
         from azure.cli.command_modules.appservice._create_util import detect_os_from_src
         import tempfile
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'index.html'), 'w') as f:
-            f.write('<html></html>')
-        result = detect_os_from_src(tmp, html=True)
-        self.assertEqual(result, "Linux")
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'index.html'), 'w') as f:
+                f.write('<html></html>')
+            result = detect_os_from_src(tmp, html=True)
+            self.assertEqual(result, "Linux")
 
     def test_runtime_override_python(self):
         from azure.cli.command_modules.appservice._create_util import detect_os_from_src
         import tempfile
-        tmp = tempfile.mkdtemp()
-        result = detect_os_from_src(tmp, runtime="python|3.11")
-        self.assertEqual(result, "Linux")
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            result = detect_os_from_src(tmp, runtime="python|3.11")
+            self.assertEqual(result, "Linux")
 
     def test_runtime_override_aspnet(self):
         from azure.cli.command_modules.appservice._create_util import detect_os_from_src
         import tempfile
-        tmp = tempfile.mkdtemp()
-        result = detect_os_from_src(tmp, runtime="aspnet|4.8")
-        self.assertEqual(result, "Windows")
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            result = detect_os_from_src(tmp, runtime="aspnet|4.8")
+            self.assertEqual(result, "Windows")
 
 
 class TestGetLangFromContent(unittest.TestCase):
@@ -706,26 +696,22 @@ class TestGetLangFromContent(unittest.TestCase):
     def test_html_autodetected_without_flag(self):
         from azure.cli.command_modules.appservice._create_util import get_lang_from_content
         import tempfile
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'index.html'), 'w') as f:
-            f.write('<html></html>')
-        result = get_lang_from_content(tmp, html=False)
-        self.assertEqual(result['language'], 'static')
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'index.html'), 'w') as f:
+                f.write('<html></html>')
+            result = get_lang_from_content(tmp, html=False)
+            self.assertEqual(result['language'], 'static')
 
     def test_python_takes_precedence_over_html(self):
         from azure.cli.command_modules.appservice._create_util import get_lang_from_content
         import tempfile
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
-            f.write('flask\n')
-        with open(os.path.join(tmp, 'index.html'), 'w') as f:
-            f.write('<html></html>')
-        result = get_lang_from_content(tmp, html=False)
-        self.assertEqual(result['language'], 'python')
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
+                f.write('flask\n')
+            with open(os.path.join(tmp, 'index.html'), 'w') as f:
+                f.write('<html></html>')
+            result = get_lang_from_content(tmp, html=False)
+            self.assertEqual(result['language'], 'python')
 
 
 class TestDetectPythonVersion(unittest.TestCase):
@@ -734,54 +720,46 @@ class TestDetectPythonVersion(unittest.TestCase):
     def test_detect_from_runtime_txt(self):
         from azure.cli.command_modules.appservice._create_util import _detect_python_version
         import tempfile
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
-            f.write('flask\n')
-        with open(os.path.join(tmp, 'runtime.txt'), 'w') as f:
-            f.write('python-3.11.4\n')
-        result = _detect_python_version(os.path.join(tmp, 'requirements.txt'))
-        self.assertEqual(result, '3.11')
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
+                f.write('flask\n')
+            with open(os.path.join(tmp, 'runtime.txt'), 'w') as f:
+                f.write('python-3.11.4\n')
+            result = _detect_python_version(os.path.join(tmp, 'requirements.txt'))
+            self.assertEqual(result, '3.11')
 
     def test_detect_from_python_version_file(self):
         from azure.cli.command_modules.appservice._create_util import _detect_python_version
         import tempfile
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
-            f.write('flask\n')
-        with open(os.path.join(tmp, '.python-version'), 'w') as f:
-            f.write('3.10.2\n')
-        result = _detect_python_version(os.path.join(tmp, 'requirements.txt'))
-        self.assertEqual(result, '3.10')
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
+                f.write('flask\n')
+            with open(os.path.join(tmp, '.python-version'), 'w') as f:
+                f.write('3.10.2\n')
+            result = _detect_python_version(os.path.join(tmp, 'requirements.txt'))
+            self.assertEqual(result, '3.10')
 
     def test_no_version_file_returns_dash(self):
         from azure.cli.command_modules.appservice._create_util import _detect_python_version
         import tempfile
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
-            f.write('flask\n')
-        result = _detect_python_version(os.path.join(tmp, 'requirements.txt'))
-        self.assertEqual(result, '-')
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
+                f.write('flask\n')
+            result = _detect_python_version(os.path.join(tmp, 'requirements.txt'))
+            self.assertEqual(result, '-')
 
     def test_runtime_txt_takes_precedence(self):
         from azure.cli.command_modules.appservice._create_util import _detect_python_version
         import tempfile
-        tmp = tempfile.mkdtemp()
-        with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
-            f.write('flask\n')
-        with open(os.path.join(tmp, 'runtime.txt'), 'w') as f:
-            f.write('python-3.12.0\n')
-        with open(os.path.join(tmp, '.python-version'), 'w') as f:
-            f.write('3.10\n')
-        result = _detect_python_version(os.path.join(tmp, 'requirements.txt'))
-        self.assertEqual(result, '3.12')
-        import shutil
-        shutil.rmtree(tmp)
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, 'requirements.txt'), 'w') as f:
+                f.write('flask\n')
+            with open(os.path.join(tmp, 'runtime.txt'), 'w') as f:
+                f.write('python-3.12.0\n')
+            with open(os.path.join(tmp, '.python-version'), 'w') as f:
+                f.write('3.10\n')
+            result = _detect_python_version(os.path.join(tmp, 'requirements.txt'))
+            self.assertEqual(result, '3.12')
 
 
 class TestValidateRuntimeOsCombo(unittest.TestCase):