From e5ce3b0893aa5155c23a0f1b74fc8ab6d0ba0f30 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 9 Feb 2024 14:05:48 +0100 Subject: [PATCH] Simplify python command string in conanfile.py Removed unnecessary string manipulation based on operating system in conanfile.py. The prior implementation used different types of quotes depending on the OS to form a python command string. This change applies one single format for all OS's simplifying the code. Contributes to CURA-11079 --- conanfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6d5ee0e099..abe3db97a1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -173,11 +173,9 @@ class CuraConan(ConanFile): env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) venv_vars = env.vars(self, scope = "run") - outer = '"' if self.settings.os == "Windows" else "'" - inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() with venv_vars.apply(): - self.run(f"""python -c {outer}import importlib_metadata; print({{dist.metadata[{inner}Name{inner}]: {{{inner}version{inner}: dist.version}} for dist in importlib_metadata.distributions()}}){outer}""", + self.run("""python -c "import importlib_metadata; print({dist.metadata['Name']: {'version': dist.version} for dist in importlib_metadata.distributions()})" """, env = "conanrun", output = buffer) return str(buffer.getvalue()).split("-----------------\n")[-1].strip()