Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bsd2 license #73

Closed
wants to merge 8 commits into from
Closed

Bsd2 license #73

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f65895
Change the copyright regex to allow a comma after the year(s).
clalancette Apr 25, 2017
77061fd
Change the copyright regex to allow a (c) after the "Copyright" word.
clalancette Apr 25, 2017
0eb7b5d
Move the identify_copyright method into SourceDescriptor.
clalancette Apr 26, 2017
9f97869
Add in support for the BSD 2.0 license.
clalancette Apr 25, 2017
ed04f19
Make identify_license() a method of FileDescriptor again.
clalancette Apr 26, 2017
b7567a7
Switch to using difflib for the comparisons.
clalancette Apr 28, 2017
868fb69
Fix review comments.
clalancette Apr 28, 2017
21661e7
Split licenses up by {company}, and match substrings.
clalancette May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ament_copyright/ament_copyright/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def search_copyright_information(content):
year = '\d{4}'
year_range = '%s-%s' % (year, year)
year_or_year_range = '(?:%s|%s)' % (year, year_range)
pattern = '^[^\n\r]?\s*Copyright\s+(%s(?:,\s*%s)*)\s+([^\n\r]+)$' % \
pattern = '^[^\n\r]?\s*Copyright(?:\s+\(c\))?\s+(%s(?:,\s*%s)*),?\s+([^\n\r]+)$' % \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have to support this case or could we update the code using that.

Copy link
Contributor Author

@clalancette clalancette Apr 26, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, this regex change is to allow a (c) after the word "Copyright". While we could change the code that has this, the BSD license recommends this format:

Copyright (c) <year>, <rights-holder>

(https://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22BSD_License_2.0.22.2C_.22Revised_BSD_License.22.2C_.22New_BSD_License.22.2C_or_.22Modified_BSD_License.22.29).
Thus, any BSD code we come across is likely to be in that format, so I thought it would be better to support that.

(year_or_year_range, year_or_year_range)
regex = re.compile(pattern, re.DOTALL | re.MULTILINE)

Expand Down