Roll third_party/pexpect 509:533

Roll third_party/pexpect 509:533

The author kindly updated the license headers as requested by nduca.
One of the files requires more context for the license to be detected,
so increase it to 100 (instead of the default 60).

BUG=156113
TEST=tools/checklicenses/checklicenses.py --root . -vv third_party/pexpect


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167398

[bulach, 2012-11-06 12:11:07]

open-source-third-party-reviews: the author has added license info on all files,
would you mind double checking the new text is still fine? thanks!

[nduca, 2012-11-06 16:25:49]

Go into tools/checklicenses/checklicenses.py and remove the supression for
pexpect in there. Then run checklicenses or throw out a try job. It should
confirm whether this is okay.

[bulach, 2012-11-06 17:27:13]

blackhole warning... :)

our tools/checklicenses/checklicenses.py calls
third_party/devscripts/licensescheck.pl, which checks for the license in a
case-sensitive manner.... :(

I'm adding phajdan.jr as there are a few TODOs in his name there to change the
licensecheck... phajdan: would you be able to help us to also make it case
insensitive?

I think this means we can update this to get all the correct license in place
(pending open-source approval), and separately, improve licesencheck.pl to be
insensitive, and then once we roll that, we can remove the suppression in
checklicenses.py. how does it sound?

[Paweł Hajdan Jr., 2012-11-06 18:29:54]

Please provide more details, I'm happy to help. What would your proposed change
to licensecheck.pl look like?

Generally, I'm ok with making matches case-insensitive.

[bulach, 2012-11-06 18:36:59]

thanks Pawel!

in licensecheck.pl, there's a sub parselicense($).

afaict, in there it does case-sensitive matching of the parsed licensed... I'm
not a lawyer and everything :) but hopefully it could be slightly relaxed?

as in, the new licenses for the pexpect package here would match if there was a
"i" in the end of the re...

diff --git a/third_party/devscripts/licensecheck.pl
b/third_party/devscripts/licensecheck.pl
index 6858362..ab47b80 100755
--- a/third_party/devscripts/licensecheck.pl
+++ b/third_party/devscripts/licensecheck.pl
@@ -458,7 +458,7 @@ sub parselicense($) {
        $license = "University of Illinois/NCSA Open Source License (BSD like)
$license";
     }
 
-    if ($licensetext  =~ /Permission to use, copy, modify, and(\/or)?
distribute this software (and its docum
+    if ($licensetext  =~ /Permission to use, copy, modify, and(\/or)?
distribute this software (and its docum
        $license = "ISC $license";
     }

[bulach, 2012-11-06 18:37:49]

sorry, terminal didn't copy the full patch:

diff --git a/third_party/devscripts/licensecheck.pl
b/third_party/devscripts/licensecheck.pl
index 6858362..ab47b80 100755
--- a/third_party/devscripts/licensecheck.pl
+++ b/third_party/devscripts/licensecheck.pl
@@ -458,7 +458,7 @@ sub parselicense($) {
 	$license = "University of Illinois/NCSA Open Source License (BSD like)
$license";
     }
 
-    if ($licensetext  =~ /Permission to use, copy, modify, and(\/or)?
distribute this software (and its documentation )?for any purpose (with or
)?without fee is hereby granted, provided.*(copyright|entire) notice.*all
copies/) {
+    if ($licensetext  =~ /Permission to use, copy, modify, and(\/or)?
distribute this software (and its documentation )?for any purpose (with or
)?without fee is hereby granted, provided.*(copyright|entire) notice.*all
copies/i) {
 	$license = "ISC $license";
     }

[Paweł Hajdan Jr., 2012-11-06 18:50:29]

Okay, go ahead and make that change in licensecheck.pl please.

[bulach, 2012-11-07 10:07:18]

thanks Pawel! patch on your way:
http://codereview.chromium.org/11365130/

[bulach, 2012-11-08 13:59:22]

the other patch for licensecheck.pl landed, thanks!
this is good to go, a quick look please?

[Paweł Hajdan Jr., 2012-11-08 17:42:04]

LGTM, thank you.

http://codereview.chromium.org/11360098/diff/10001/tools/checklicenses/checkl...
File tools/checklicenses/checklicenses.py (left):

http://codereview.chromium.org/11360098/diff/10001/tools/checklicenses/checkl...
tools/checklicenses/checklicenses.py:335: 'third_party/pexpect': [ #
http://crbug.com/156113
Yay, removing an excpetion. Awesome!

http://codereview.chromium.org/11360098/diff/10001/tools/checklicenses/checkl...
File tools/checklicenses/checklicenses.py (right):

http://codereview.chromium.org/11360098/diff/10001/tools/checklicenses/checkl...
tools/checklicenses/checklicenses.py:456: '-l', '100',
Just checking: do you need this? If so, OK.

[bulach, 2012-11-08 17:45:36]

thanks pawel! clarification below, will wait for
open-source-third-party-reviews@ to be on the safe side :)

http://codereview.chromium.org/11360098/diff/10001/tools/checklicenses/checkl...
File tools/checklicenses/checklicenses.py (left):

http://codereview.chromium.org/11360098/diff/10001/tools/checklicenses/checkl...
tools/checklicenses/checklicenses.py:335: 'third_party/pexpect': [ #
http://crbug.com/156113
On 2012/11/08 17:42:04, Paweł Hajdan Jr. wrote:
> Yay, removing an excpetion. Awesome!

:)

http://codereview.chromium.org/11360098/diff/10001/tools/checklicenses/checkl...
File tools/checklicenses/checklicenses.py (right):

http://codereview.chromium.org/11360098/diff/10001/tools/checklicenses/checkl...
tools/checklicenses/checklicenses.py:456: '-l', '100',
On 2012/11/08 17:42:04, Paweł Hajdan Jr. wrote:
> Just checking: do you need this? If so, OK.

yes, this is needed: sorry, I forgot to update the patch description, done.

[Daniel Berlin, 2012-11-12 18:34:10]

lgtm

[commit-bot: I haz the power, 2012-11-12 21:06:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/11360098/10001

[commit-bot: I haz the power, 2012-11-13 14:31:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/11360098/10001

[commit-bot: I haz the power, 2012-11-13 16:35:18]

Change committed as 167398