From 269754c50ff30ad884fe891f019b17aef5b00921 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Tue, 24 May 2022 12:50:09 -0700 Subject: [PATCH] Remove suffixes when tallying holders #2972 Signed-off-by: Jono Yang --- src/summarycode/copyright_tallies.py | 72 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/src/summarycode/copyright_tallies.py b/src/summarycode/copyright_tallies.py index cd01b910464..8c87d0605b9 100644 --- a/src/summarycode/copyright_tallies.py +++ b/src/summarycode/copyright_tallies.py @@ -485,49 +485,49 @@ def filter_junk(texts): COMMON_NAMES = { - '3dfxinteractiveinc.': '3dfx Interactive, Inc.', + '3dfxinteractiveinc.': '3dfx Interactive', 'cern': 'CERN - European Organization for Nuclear Research', - 'ciscosystemsinc': 'Cisco Systems, Inc.', - 'ciscosystems': 'Cisco Systems, Inc.', - 'cisco': 'Cisco Systems, Inc.', + 'ciscosystemsinc': 'Cisco Systems', + 'ciscosystems': 'Cisco Systems', + 'cisco': 'Cisco Systems', - 'daisy': 'Daisy Ltd.', + 'daisy': 'Daisy', - 'fsf': 'Free Software Foundation, Inc.', - 'freesoftwarefoundation': 'Free Software Foundation, Inc.', - 'freesoftwarefoundationinc': 'Free Software Foundation, Inc.', - 'thefreesoftwarefoundation': 'Free Software Foundation, Inc.', - 'thefreesoftwarefoundationinc': 'Free Software Foundation, Inc.', + 'fsf': 'Free Software Foundation', + 'freesoftwarefoundation': 'Free Software Foundation', + 'freesoftwarefoundationinc': 'Free Software Foundation', + 'thefreesoftwarefoundation': 'Free Software Foundation', + 'thefreesoftwarefoundationinc': 'Free Software Foundation', - 'hp': 'Hewlett-Packard, Inc.', - 'hewlettpackard': 'Hewlett-Packard, Inc.', - 'hewlettpackardco': 'Hewlett-Packard, Inc.', - 'hpcompany': 'Hewlett-Packard, Inc.', - 'hpdevelopmentcompanylp': 'Hewlett-Packard, Inc.', - 'hpdevelopmentcompany': 'Hewlett-Packard, Inc.', - 'hewlettpackardcompany': 'Hewlett-Packard, Inc.', + 'hp': 'Hewlett-Packard', + 'hewlettpackard': 'Hewlett-Packard', + 'hewlettpackardco': 'Hewlett-Packard', + 'hpcompany': 'Hewlett-Packard', + 'hpdevelopmentcompanylp': 'Hewlett-Packard', + 'hpdevelopmentcompany': 'Hewlett-Packard', + 'hewlettpackardcompany': 'Hewlett-Packard', - 'theandroidopensourceproject': 'The Android Open Source Project, Inc.', - 'androidopensourceproject': 'The Android Open Source Project, Inc.', + 'theandroidopensourceproject': 'Android Open Source Project', + 'androidopensourceproject': 'Android Open Source Project', - 'ibm': 'IBM Corporation', + 'ibm': 'IBM', - 'redhat': 'Red Hat, Inc.', - 'redhatinc': 'Red Hat, Inc.', + 'redhat': 'Red Hat', + 'redhatinc': 'Red Hat', - 'softwareinthepublicinterest': 'Software in the Public Interest, Inc.', - 'spiinc': 'Software in the Public Interest, Inc.', + 'softwareinthepublicinterest': 'Software in the Public Interest', + 'spiinc': 'Software in the Public Interest', - 'suse': 'SuSE, Inc.', - 'suseinc': 'SuSE, Inc.', + 'suse': 'SuSE', + 'suseinc': 'SuSE', - 'sunmicrosystems': 'Sun Microsystems, Inc.', - 'sunmicrosystemsinc': 'Sun Microsystems, Inc.', - 'sunmicro': 'Sun Microsystems, Inc.', + 'sunmicrosystems': 'Sun Microsystems', + 'sunmicrosystemsinc': 'Sun Microsystems', + 'sunmicro': 'Sun Microsystems', - 'thaiopensourcesoftwarecenter': 'Thai Open Source Software Center Ltd.', + 'thaiopensourcesoftwarecenter': 'Thai Open Source Software Center', 'apachefoundation': 'The Apache Software Foundation', 'apachegroup': 'The Apache Software Foundation', @@ -540,20 +540,18 @@ def filter_junk(texts): 'regentsoftheuniversityofcalifornia': 'The Regents of the University of California', - # 'mit': 'the Massachusetts Institute of Technology', - - 'borland': 'Borland Corp.', + 'borland': 'Borland', 'microsoft': 'Microsoft', 'microsoftcorp': 'Microsoft', 'microsoftinc': 'Microsoft', 'microsoftcorporation': 'Microsoft', - 'google': 'Google Inc.', - 'googlellc': 'Google Inc.', - 'googleinc': 'Google Inc.', + 'google': 'Google', + 'googlellc': 'Google', + 'googleinc': 'Google', - 'intel': 'Intel Corporation', + 'intel': 'Intel', } # Remove everything except letters and numbers