Commit ff4cd170 authored by Mitchell Hentges's avatar Mitchell Hentges
Browse files

Bug 1759193: Remove workaround for handling `local/` in venv paths r=ahal 

Now that we're using `sysconfig` instead of `distutils`, our `purelib`
and `platlib` paths should correctly point to python environment paths
without a spurious `local/` component at their roots.

Differential Revision: https://phabricator.services.mozilla.com/D140871
parent dd145d98

python/mach/mach/site.py

+1 −6
Original line number Diff line number Diff line
@@ -808,12 +808,7 @@ class PythonVirtualenv: 


        normalized_venv_root = os.path.normpath(self.prefix)

        # Path to virtualenv's "site-packages" directory for provided sysconfig path

        path = os.path.join(normalized_venv_root, relative_path)

        local_folder = os.path.join(normalized_venv_root, "local")

        # Hack around https://github.com/pypa/virtualenv/issues/2208

        if path.startswith(local_folder):

            path = os.path.join(normalized_venv_root, path[len(local_folder) + 1 :])

        return path

        return os.path.join(normalized_venv_root, relative_path)



    def site_packages_dirs(self):

        return [