Add colorama to third_party/colorama

Add colorama to third_party/colorama

colorama is a python library for colored terminal output

BUG=374830, 374662
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275996

[chromium-reviews, 2014-05-19 23:57:01]

I don't think this is the right crbug for the UNKNOWN issue.
Assuming it's not a known issue, can you please just fix checklicenses to work?

Otherwise okay.


On Mon, May 19, 2014 at 1:21 PM,  <cjhopman@chromium.org> wrote:
> Reviewers: open-source-third-party-reviews_google.com,
>
> Description:
> Add colorama to third_party/colorama
>
> colorama is a python library for colored terminal output
>
> BUG=374830
>
> Please review this at https://codereview.chromium.org/291783002/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files (+51, -0 lines):
>   M .gitignore
>   M DEPS
>   A third_party/colorama/LICENSE
>   A third_party/colorama/README.chromium
>   M tools/checklicenses/checklicenses.py
>
>
> Index: .gitignore
> diff --git a/.gitignore b/.gitignore
> index
>
85a6db25da948155b6faa4317a92b3c72003f904..161b840e5b2d3eea283bc9fa3cdf953d02b25512
> 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -233,6 +233,7 @@ v8.log
>  /third_party/clang_format/script
>  !/third_party/clang_format/bin/*/*.sha1
>  /third_party/cld_2/src
> +/third_party/colorama/src
>  /third_party/cros
>  /third_party/cros_system_api
>  /third_party/cygwin
> Index: DEPS
> diff --git a/DEPS b/DEPS
> index
>
89391016a992d92f93a81e4bace384f9ddc97ef8..bf9957685988fa00ab974ce083209055fb6efa4d
> 100644
> --- a/DEPS
> +++ b/DEPS
> @@ -20,6 +20,7 @@
>  vars = {
>    # Use this googlecode_url variable only if there is an internal mirror
> for it.
>    # If you do not know, use the full path while defining your new deps
> entry.
> +  "github_url": "https://github.com/%s.git",
>    "googlecode_url": "http://%s.googlecode.com/svn",
>    "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
>    "llvm_url": "http://src.chromium.org/llvm-project",
> @@ -85,6 +86,9 @@ deps = {
>    "src/breakpad/src":
>      (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1331",
>
> +  "src/third_party/colorama/src":
> +    (Var("github_url") % "tartley/colorama") + "@799604a104",
> +
>    "src/buildtools":
>      Var("chromium_git") + "/chromium/buildtools.git@" +
>       Var("buildtools_revision"),
> Index: third_party/colorama/LICENSE
> diff --git a/third_party/colorama/LICENSE b/third_party/colorama/LICENSE
> new file mode 100644
> index
>
0000000000000000000000000000000000000000..5f567799f395f33acd05abbc5d409dd126ce0dc8
> --- /dev/null
> +++ b/third_party/colorama/LICENSE
> @@ -0,0 +1,28 @@
> +Copyright (c) 2010 Jonathan Hartley
> +All rights reserved.
> +
> +Redistribution and use in source and binary forms, with or without
> +modification, are permitted provided that the following conditions are met:
> +
> +* Redistributions of source code must retain the above copyright notice,
> this
> +  list of conditions and the following disclaimer.
> +
> +* Redistributions in binary form must reproduce the above copyright notice,
> +  this list of conditions and the following disclaimer in the documentation
> +  and/or other materials provided with the distribution.
> +
> +* Neither the name of the copyright holders, nor those of its contributors
> +  may be used to endorse or promote products derived from this software
> without
> +  specific prior written permission.
> +
> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> AND
> +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> IMPLIED
> +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
> LIABLE
> +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
> +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> LIABILITY,
> +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
> USE
> +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> Index: third_party/colorama/README.chromium
> diff --git a/third_party/colorama/README.chromium
> b/third_party/colorama/README.chromium
> new file mode 100644
> index
>
0000000000000000000000000000000000000000..68f9b3977654119103c467b812d129cd3571097b
> --- /dev/null
> +++ b/third_party/colorama/README.chromium
> @@ -0,0 +1,13 @@
> +Name: colorama
> +Short Name: colorama
> +URL: https://github.com/tartley/colorama.git
> +Version: 799604a104
> +License: BSD
> +Security Critical: no
> +
> +Description:
> +Provides a simple cross-platform API to print colored terminal text from
> Python
> +applications.
> +
> +Local modifications:
> +None
> Index: tools/checklicenses/checklicenses.py
> diff --git a/tools/checklicenses/checklicenses.py
> b/tools/checklicenses/checklicenses.py
> index
>
49e662fcf67c25b84fbc05e532dd437839566e9e..e59d9969f68bf03abe4856dad85689f8c5d24f32
> 100755
> --- a/tools/checklicenses/checklicenses.py
> +++ b/tools/checklicenses/checklicenses.py
> @@ -154,6 +154,11 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
>          'UNKNOWN',
>      ],
>
> +    # http://crbug.com/374622
> +    'third_party/colorama/src': [
> +        'UNKNOWN',
> +    ],
> +
>      'third_party/devscripts': [
>          'GPL (v2 or later)',
>      ],
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[cjhopman, 2014-05-20 01:18:40]

On 2014/05/19 23:57:01, chromium-reviews_chromium.org wrote:
> I don't think this is the right crbug for the UNKNOWN issue.
Ha, fixed it. The bug is http://crbug.com/374662.

> Assuming it's not a known issue, can you please just fix checklicenses to
work?
> 
> Otherwise okay.
> 

From the bug, colorama has license headers like:

#!/usr/bin/env python
# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.

and licensecheck.pl doesn't recognize them (if the problem were in
checklicenses.py I could probably fix it, but not licensecheck.pl).

[cjhopman, 2014-05-20 20:31:54]

thestig@chromium.org: Please review changes in tools/checklicenses/

darin@chromium.org: Please review changes in 
DEPS
.gitignore
third_party/

[Lei Zhang, 2014-05-20 20:39:01]

https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
File tools/checklicenses/checklicenses.py (right):

https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
tools/checklicenses/checklicenses.py:303: 'third_party/colorama/src': [
Are tools/swarming_client/third_party/colorama and third_party/colorama the same
code?

https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
tools/checklicenses/checklicenses.py:304: 'UNKOWN',
https://code.google.com/p/colorama/issues/detail?id=44 has been marked as fixed.
Why do we still need this suppression?

There's also a typo.

[cjhopman, 2014-05-20 20:48:08]

https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
File tools/checklicenses/checklicenses.py (right):

https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
tools/checklicenses/checklicenses.py:303: 'third_party/colorama/src': [
On 2014/05/20 20:39:01, Lei Zhang wrote:
> Are tools/swarming_client/third_party/colorama and third_party/colorama the
same
> code?
Yes, but tools/swarming_client is a separate repo (I don't know if they can just
assume that they are being used within a chrome checkout or not). We also have
colorama at depot_tools/third_party/colorama.

https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
tools/checklicenses/checklicenses.py:304: 'UNKOWN',
On 2014/05/20 20:39:01, Lei Zhang wrote:
> https://code.google.com/p/colorama/issues/detail?id=44 has been marked as
fixed.
> Why do we still need this suppression?

Because licensecheck.pl doesn't recognize the license headers that colorama
added to their files.

> 
> There's also a typo.

Done.

[Lei Zhang, 2014-05-20 22:38:00]

https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
File tools/checklicenses/checklicenses.py (right):

https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
tools/checklicenses/checklicenses.py:304: 'UNKOWN',
On 2014/05/20 20:48:09, cjhopman wrote:
> On 2014/05/20 20:39:01, Lei Zhang wrote:
> > https://code.google.com/p/colorama/issues/detail?id=44 has been marked as
> fixed.
> > Why do we still need this suppression?
> 
> Because licensecheck.pl doesn't recognize the license headers that colorama
> added to their files.

Can you just fix licensecheck.pl instead? it's a 3 line change.

[cjhopman, 2014-05-20 23:24:18]

On 2014/05/20 22:38:00, Lei Zhang wrote:
>
https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
> File tools/checklicenses/checklicenses.py (right):
> 
>
https://codereview.chromium.org/291783002/diff/20001/tools/checklicenses/chec...
> tools/checklicenses/checklicenses.py:304: 'UNKOWN',
> On 2014/05/20 20:48:09, cjhopman wrote:
> > On 2014/05/20 20:39:01, Lei Zhang wrote:
> > > https://code.google.com/p/colorama/issues/detail?id=44 has been marked as
> > fixed.
> > > Why do we still need this suppression?
> > 
> > Because licensecheck.pl doesn't recognize the license headers that colorama
> > added to their files.
> 
> Can you just fix licensecheck.pl instead? it's a 3 line change.

Ah, I didn't realize that was in this repo or that we had local modifications. I
think I did this right, but... well, it's perl.

[Lei Zhang, 2014-05-20 23:37:58]

checklicenses bits lgtm

https://codereview.chromium.org/291783002/diff/30001/tools/checklicenses/chec...
File tools/checklicenses/checklicenses.py (right):

https://codereview.chromium.org/291783002/diff/30001/tools/checklicenses/chec...
tools/checklicenses/checklicenses.py:302: # https://crbug.com/374662
You can add 374662 to BUG=

https://codereview.chromium.org/291783002/diff/50001/DEPS
File DEPS (right):

https://codereview.chromium.org/291783002/diff/50001/DEPS#newcode23
DEPS:23: "github_url": "https://github.com/%s.git",
I'm not sure if this is the right way or if we prefer to go through a mirror.

[cjhopman, 2014-06-09 23:48:00]

Darin: ptal for OWNERS of DEPS, .gitignore, and third_party/

https://codereview.chromium.org/291783002/diff/50001/DEPS
File DEPS (right):

https://codereview.chromium.org/291783002/diff/50001/DEPS#newcode23
DEPS:23: "github_url": "https://github.com/%s.git",
On 2014/05/20 23:37:59, Lei Zhang wrote:
> I'm not sure if this is the right way or if we prefer to go through a mirror.
Done. Was waiting on infra setting up the mirror.

[darin (slow to review), 2014-06-10 00:04:53]

LGTM

[cjhopman, 2014-06-10 00:48:29]

The CQ bit was checked by cjhopman@chromium.org

[commit-bot: I haz the power, 2014-06-10 00:51:09]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/cjhopman@chromium.org/291783002/90001

[commit-bot: I haz the power, 2014-06-10 12:34:11]

Change committed as 275996

[alph, 2014-06-10 13:16:28]

A revert of this CL has been created in
https://codereview.chromium.org/328663005/ by alph@chromium.org.

The reason for reverting is: Broke the build
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%2....