Merge pull request #2940 from esafak/fix/2930-tcl-library-bug

fix: Correctly unpack _get_tcl_tk_libs() response in PythonInfo

Author: gaborbernat

docs/changelog/2930.bugfix.rst

@@ -0,0 +1,2 @@
+Correctly unpack _get_tcl_tk_libs() response in PythonInfo.
+Contributed by :user:`esafak`.

src/virtualenv/activation/bash/__init__.py

@@ -12,6 +12,14 @@ def templates(self):
     def as_name(self, template):
         return Path(template).stem
 
+    def replacements(self, creator, dest):
+        data = super().replacements(creator, dest)
+        data.update({
+            "__TCL_LIBRARY__": creator.interpreter.tcl_lib or "",
+            "__TK_LIBRARY__": creator.interpreter.tk_lib or "",
+        })
+        return data
+
 
 __all__ = [
     "BashActivator",

src/virtualenv/activation/bash/activate.sh

@@ -79,15 +79,15 @@ if ! [ -z "${PYTHONHOME+_}" ] ; then
     unset PYTHONHOME
 fi
 
-if [ __TCL_LIBRARY__ != "''" ]; then
+if [ __TCL_LIBRARY__ != "" ]; then
     if ! [ -z "${TCL_LIBRARY+_}" ] ; then
         _OLD_VIRTUAL_TCL_LIBRARY="$TCL_LIBRARY"
     fi
     TCL_LIBRARY=__TCL_LIBRARY__
     export TCL_LIBRARY
 fi
 
-if [ __TK_LIBRARY__ != "''" ]; then
+if [ __TK_LIBRARY__ != "" ]; then
     if ! [ -z "${TK_LIBRARY+_}" ] ; then
         _OLD_VIRTUAL_TK_LIBRARY="$TK_LIBRARY"
     fi

src/virtualenv/discovery/py_info.py

@@ -123,7 +123,10 @@ def abs_path(v):
 
         self.sysconfig_vars = {i: sysconfig.get_config_var(i or "") for i in config_var_keys}
 
-        self.tcl_lib, self.tk_lib = self._get_tcl_tk_libs() if "TCL_LIBRARY" in os.environ else None, None
+        if "TCL_LIBRARY" in os.environ:
+            self.tcl_lib, self.tk_lib = self._get_tcl_tk_libs()
+        else:
+            self.tcl_lib, self.tk_lib = None, None
 
         confs = {
             k: (self.system_prefix if v is not None and v.startswith(self.prefix) else v)

tests/unit/activation/test_bash.py

@@ -48,16 +48,16 @@ def __init__(self, dest):
     assert "unset _OLD_VIRTUAL_TK_LIBRARY" in content
 
     if present:
-        assert "if [ /path/to/tcl != \"''\" ]; then" in content
+        assert 'if [ /path/to/tcl != "" ]; then' in content
         assert "TCL_LIBRARY=/path/to/tcl" in content
         assert "export TCL_LIBRARY" in content
 
-        assert "if [ /path/to/tk != \"''\" ]; then" in content
+        assert 'if [ /path/to/tk != "" ]; then' in content
         assert "TK_LIBRARY=/path/to/tk" in content
         assert "export TK_LIBRARY" in content
     else:
         # When not present, the if condition is false, so the block is not executed
-        assert "if [ '' != \"''\" ]; then" in content
+        assert "if [ '' != \"\" ]; then" in content, content
         assert "TCL_LIBRARY=''" in content
         # The export is inside the if, so this is fine
         assert "export TCL_LIBRARY" in content