a6add8ae090edaf8ce525d49d9fe0cf38a0a91c7,src/python/pants/backend/python/dependency_inference/module_mapper.py,,merge_first_party_module_mappings,#Any#,90

Before Change

    for mapping in all_mappings:
        for module, addresses in mapping.items():
            if module in modules_to_addresses:
                modules_with_multiple_implementations.add(module)
            else:
                modules_to_addresses[module] = addresses
    for module in modules_with_multiple_implementations:
        modules_to_addresses.pop(module)

After Change

            if module in modules_with_multiple_implementations:
                modules_with_multiple_implementations[module].update(addresses)
            elif module in modules_to_addresses:
                modules_with_multiple_implementations[module].update(
                    {*modules_to_addresses[module], *addresses}
                )
            else:
                modules_to_addresses[module] = addresses

    // Finally, remove any newly ambiguous modules from the previous step.
    for module in modules_with_multiple_implementations:
        if module in modules_to_addresses:
            modules_to_addresses.pop(module)

    return FirstPartyPythonModuleMapping(
        mapping=FrozenDict(sorted(modules_to_addresses.items())),
        ambiguous_modules=FrozenDict(
            (k, tuple(sorted(v))) for k, v in sorted(modules_with_multiple_implementations.items())
        ),
    )

Instances