Update ABOUT files under thirdparty Fixed #296

chinyeungli · chinyeungli · commit e4317f63430c · 2017-12-08T07:22:23.000+08:00
Signed-off-by: Chin Yeung Li &lt;tli@nexb.com&gt;
diff --git a/src/attributecode/model.py b/src/attributecode/model.py
@@ -191,7 +191,7 @@ def serialized_value(self):
 
     @property
     def has_content(self):
-        return self.original_value and self.original_value.strip()
+        return self.original_value
 
     def __repr__(self):
         name = self.name
diff --git a/thirdparty/base/appdirs.ABOUT b/thirdparty/base/appdirs.ABOUT
@@ -11,8 +11,5 @@ vcs_repository: https://github.com/ActiveState/appdirs.git
 
 copyright: Copyright (c) 2010 ActiveState Software Inc.
 
-dje_license: mit
-license_text_file: 
-    - appdirs.LICENSE
-    
-    
+license_expression: mit
+license_file: appdirs.LICENSE
diff --git a/thirdparty/base/certifi.ABOUT b/thirdparty/base/certifi.ABOUT
@@ -9,6 +9,6 @@ contact: me@kennethreitz.com
 homepage_url: http://certifi.io/
 name: certifi
 
-dje_license: mpl-2.0
-license_text_file: mpl-2.0.LICENSE
+license_expression: mpl-2.0
+license_file: mpl-2.0.LICENSE
 notice_file: certifi.NOTICE
diff --git a/thirdparty/base/chardet.ABOUT b/thirdparty/base/chardet.ABOUT
@@ -3,8 +3,8 @@ name: chardet
 version: 3.0.3
 homepage_url: https://github.com/chardet/chardet
 download_url: https://pypi.python.org/packages/8c/27/99f781a11e4daa5acadf97add6e5883ec5f8f9abbf279e790fd0ff371db7/chardet-3.0.3-py2.py3-none-any.whl
-dje_license: lgpl-2.1
-license_text_url: https://raw.github.com/erikrose/chardet/70af46cb8e146326081fd76360d1c19675ee627c/COPYING
-license_text_file: lgpl-2.1.LICENSE
+license_expression: lgpl-2.1
+license_url: https://raw.github.com/erikrose/chardet/70af46cb8e146326081fd76360d1c19675ee627c/COPYING
+license_file: lgpl-2.1.LICENSE
 vcs_tool: git
 vcs_repository: https://github.com/chardet/chardet.git
diff --git a/thirdparty/base/idna.ABOUT b/thirdparty/base/idna.ABOUT
@@ -7,14 +7,14 @@ owner: Kim Davies
 homepage_url: https://github.com/kjd/idna
 name: idna
 
-copyright: 
-    - Copyright (c) 2013-2017, Kim Davies
-    - Copyright (c) 2001-2014 Python Software Foundation
-    - Copyright (c) 1991-2014 Unicode, Inc.
+copyright: |
+        Copyright (c) 2013-2017, Kim Davies
+        Copyright (c) 2001-2014 Python Software Foundation
+        Copyright (c) 1991-2014 Unicode, Inc.
 
-dje_license: bsd-new and python and unicode-data-software
+license_expression: bsd-new and python and unicode-data-software
 
-license_text_file: 
+license_file: 
     - idna.LICENSE
     - PSF.LICENSE
     - unicode-data-software.LICENSE
diff --git a/thirdparty/base/packaging.ABOUT b/thirdparty/base/packaging.ABOUT
@@ -9,10 +9,9 @@ owner: Python Packaging Authority
 
 copyright: Copyright (c) Donald Stufft and individual contributors.
 
-dje_license: bsd-simplified or apache-2.0
-license_text_file: 
+license_expression: bsd-simplified or apache-2.0
+license_file: 
     - apache-2.0.LICENSE
     - packaging.LICENSE
 
-notice_text_file: 
-    - packaging.NOTICE
+notice_file: packaging.NOTICE
diff --git a/thirdparty/base/pip.ABOUT b/thirdparty/base/pip.ABOUT
@@ -8,8 +8,8 @@ contact: python-virtualenv@groups.google.com
 homepage_url: http://www.pip-installer.org
 
 author_file: pip.AUTHORS
-dje_license: mit, OTHER TODO
-license_text_file: pip.LICENSE
+license_expression: mit, OTHER TODO
+license_file: pip.LICENSE
 
 vcs_tool: git
 vcs_repository: https://github.com/pypa/pip.git
diff --git a/thirdparty/base/pyparsing.ABOUT b/thirdparty/base/pyparsing.ABOUT
@@ -2,12 +2,12 @@ about_resource: pyparsing-2.2.0-py2.py3-none-any.whl
 name: pyparsing
 version: 2.2.0
 homepage_url: http://pyparsing.wikispaces.com/
-download_url: download_url: https://pypi.python.org/packages/6a/8a/718fd7d3458f9fab8e67186b00abdd345b639976bc7fb3ae722e1b026a50/pyparsing-2.2.0-py2.py3-none-any.whl#md5=7247e7896688eff4bc8c7fc5d0cdd2b0
+download_url: https://pypi.python.org/packages/6a/8a/718fd7d3458f9fab8e67186b00abdd345b639976bc7fb3ae722e1b026a50/pyparsing-2.2.0-py2.py3-none-any.whl#md5=7247e7896688eff4bc8c7fc5d0cdd2b0
 owner: Paul McGuire
 copyright: Copyright (c) 2003-2016 Paul T. McGuire
 
 vcs_tool: svn
 vcs_repository: http://svn.code.sf.net/p/pyparsing/code/tags/pyparsing_2.1.9/
 
-dje_license: mit
-license_text_file: pyparsing.LICENSE
+license_expression: mit
+license_file: pyparsing.LICENSE
diff --git a/thirdparty/base/requests.ABOUT b/thirdparty/base/requests.ABOUT
@@ -5,9 +5,9 @@ download_url: https://pypi.python.org/packages/29/b9/d26a6ab2ee178415ab8c0c591d2
 name: requests
 homepage_url: http://python-requests.org
 owner: Kenneth Reitz
-dje_license: apache-2.0
+license_expression: apache-2.0
 notice_file: requests.NOTICE
-license_text_file: apache-2.0.LICENSE
+license_file: apache-2.0.LICENSE
 
 vcs_tool: git
 vcs_repository: https://github.com/kennethreitz/requests.git
diff --git a/thirdparty/base/setuptools.ABOUT b/thirdparty/base/setuptools.ABOUT
@@ -7,5 +7,5 @@ name: setuptools
 homepage_url: https://pypi.python.org/pypi/setuptools
 owner: Python Packaging Authority
 
-dje_license: psf
-license_text_file: PSF.LICENSE
+license_expression: psf
+license_file: PSF.LICENSE
diff --git a/thirdparty/base/six.ABOUT b/thirdparty/base/six.ABOUT
@@ -5,8 +5,8 @@ download_url: https://pypi.python.org/packages/3.3/s/six/six-1.10.0-py2.py3-none
 name: six
 description: Python 2 and 3 compatibility utilities
 homepage_url: http://bitbucket.org/gutworth/six
-dje_license: mit
-license_text_file: six.LICENSE
+license_expression: mit
+license_file: six.LICENSE
 
 owner: Benjamin Peterson
 contact: http://www.benjamin-peterson.org/
diff --git a/thirdparty/base/urllib3.ABOUT b/thirdparty/base/urllib3.ABOUT
@@ -1,11 +1,11 @@
 about_resource: urllib3-1.21.1-py2.py3-none-any.whl
 version: 1.21.1
-download_url: "https://pypi.python.org/packages/24/53/f397db567de0aa0e81b211d81c13c41a779f14893e42189cf5bdb97611b2/urllib3-1.21.1-py2.py3-none-any.whl
+download_url: https://pypi.python.org/packages/24/53/f397db567de0aa0e81b211d81c13c41a779f14893e42189cf5bdb97611b2/urllib3-1.21.1-py2.py3-none-any.whl
 
 name: urllib3
 homepage_url: https://github.com/shazow/urllib3
-dje_license: mit
-license_text_file: urllib3.LICENSE
+license_expression: mit
+license_file: urllib3.LICENSE
 
 owner: Andrey Petrov
 copyright: Copyright 2008-2016 Andrey Petrov and contributors
diff --git a/thirdparty/base/virtualenv.py.ABOUT b/thirdparty/base/virtualenv.py.ABOUT
@@ -10,8 +10,8 @@ homepage_url: http://virtualenv.org/
 owner: The virtualenv developers
 
 license_url: https://raw.github.com/pypa/virtualenv/develop/LICENSE.txt
-license_text_file: virtualenv.LICENSE
-dje_license: mit
+license_file: virtualenv.LICENSE
+license_expression: mit
 copyright: Copyright (c) 2007 Ian Bicking and Contributors
  Copyright (c) 2009 Ian Bicking, The Open Planning Project
  Copyright (c) 2011-2016 The virtualenv developers
diff --git a/thirdparty/base/wheel.ABOUT b/thirdparty/base/wheel.ABOUT
@@ -9,5 +9,5 @@ vcs_repository: https://bitbucket.org/pypa/wheel
 
 copyright: copyright (c) 2012-2014 Daniel Holth <dholth@fastmail.fm> and
  contributors.
-dje_license: mit
-license_text_file: wheel.LICENSE
+license_expression: mit
+license_file: wheel.LICENSE
diff --git a/thirdparty/base/wincertstore.ABOUT b/thirdparty/base/wincertstore.ABOUT
@@ -4,8 +4,8 @@ download_url: https://pypi.python.org/packages/2.7/w/wincertstore/wincertstore-0
 
 name: wincertstore
 
-dje_license: psf
-license_text_file: wincertstore.LICENSE
+license_expression: psf
+license_file: wincertstore.LICENSE
 
 contact: christian@python.org
 owner: Christian Heimes
diff --git a/thirdparty/dev/apipkg.ABOUT b/thirdparty/dev/apipkg.ABOUT
@@ -5,6 +5,6 @@ version: 1.4.1
 name: apipkg
 homepage_url: https://bitbucket.org/hpk42/apipkg
 owner: Holger Krekel
-dje_license: mit
-license_text_file: apipkg.LICENSE
+license_expression: mit
+license_file: apipkg.LICENSE
 copyright: Copyright (c) 2009 holger krekel
diff --git a/thirdparty/dev/funcsigs.ABOUT b/thirdparty/dev/funcsigs.ABOUT
@@ -5,7 +5,7 @@ download_url: https://pypi.python.org/packages/94/4a/db842e7a0545de1cdb0439bb80e
 name: funcsigs
 description: funcsigs is a backport of the PEP 362 function signature features from Python 3.3’s inspect module. The backport is compatible with Python 2.6, 2.7 as well as 3.2 and up.
 
-homepage: http://funcsigs.readthedocs.org/
+homepage_url: http://funcsigs.readthedocs.org/
 owner: Testing Cabal
 license: apache-2.0
 license_file: funcsigs.LICENSE
diff --git a/thirdparty/dev/mock.ABOUT b/thirdparty/dev/mock.ABOUT
@@ -4,7 +4,7 @@ download_url: https://pypi.python.org/packages/source/m/mock/mock-2.0.0.tar.gz
 
 name: mock
 description: mock is a library for testing in Python. It allows you to replace parts of your system under test with mock objects and make assertions about how they have been used.
-homepage: https://github.com/testing-cabal/mock
+homepage_url: https://github.com/testing-cabal/mock
 owner: Testing Cabal
 contact: http://lists.idyll.org/listinfo/testing-in-python
 license: bsd-simplified
diff --git a/thirdparty/dev/pbr.ABOUT b/thirdparty/dev/pbr.ABOUT
@@ -8,7 +8,7 @@ description: |
     It started off life as the chunks of code that were copied between all of the OpenStack projects.
     Around the time that OpenStack hit 18 different projects each with at least 3 active branches, it seemed like a good time to make that code into a proper reusable library.
 
-homepage: http://git.openstack.org/cgit/openstack-dev/pbr
+homepage_url: http://git.openstack.org/cgit/openstack-dev/pbr
 owner: OpenStack
 license: apache-2.0
 license_file: pbr.LICENSE
diff --git a/thirdparty/dev/py.ABOUT b/thirdparty/dev/py.ABOUT
@@ -6,9 +6,9 @@ name: py
 description: library with cross-python path, ini-parsing, io, code, log facilities
 homepage_url: http://pylib.readthedocs.org/
 owner: holger krekel, Ronny Pfannschmidt, Benjamin Peterson and others
-contatct: pytest-dev@python.org
-dje_license: mit
-license_text_file: py.LICENSE
+contact: pytest-dev@python.org
+license_expression: mit
+license_file: py.LICENSE
 copyright: copyright (c) 2004-2014 Holger Krekel and others
 vcs_tool: git
-vcs_repo: https://github.com/pytest-dev/py.git
+vcs_repository: https://github.com/pytest-dev/py.git
diff --git a/thirdparty/dev/pytest.ABOUT b/thirdparty/dev/pytest.ABOUT
@@ -3,12 +3,12 @@ download_url: https://pypi.python.org/packages/55/9c/5529093be0f518fe710d5b92568
 version: 3.1.0
 
 name: pytest
-description: pytest: simple powerful testing with Python
+description: "pytest: simple powerful testing with Python"
 homepage_url: http://pytest.org
 owner: Holger Krekel, Benjamin Peterson, Ronny Pfannschmidt, Floris Bruynooghe and others
 contact: holger at merlinux.eu
-dje_license: mit
-license_text_file: pytest.LICENSE
+license_expression: mit
+license_file: pytest.LICENSE
 copyright: Copyright Holger Krekel and others, 2004-2014
 vcs_tool: git
-vcs_repo: https://github.com/pytest-dev/pytest.git
+vcs_repository: https://github.com/pytest-dev/pytest.git
diff --git a/thirdparty/prod/Jinja2.ABOUT b/thirdparty/prod/Jinja2.ABOUT
@@ -3,7 +3,7 @@ version: 2.9.6
 download_url: https://pypi.python.org/packages/5e/73/10c45b82a88ed6b7751bd40da31eeefd7b362e07b56a99aa6e56655a0794/Jinja2-2.9.6-py2.py3-none-any.whl#md5=61a215bcdb0f7939c70582bc00b293f1
 
 name: Jinja2
-dje_license: bsd-new
+license_expression: bsd-new
 copyright: Copyright (c) 2009 by the Jinja Team
-license_text_file: Jinja2.LICENSE
+license_file: Jinja2.LICENSE
 homepage_url: http://jinja.pocoo.org/
diff --git a/thirdparty/prod/MarkupSafe.ABOUT b/thirdparty/prod/MarkupSafe.ABOUT
@@ -3,7 +3,7 @@ version: 1.0
 download_url: https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz#md5=2fcedc9284d50e577b5192e8e3578355
 
 name: MarkupSafe
-dje_license: bsd-new
+license_expression: bsd-new
 copyright: Copyright (c) 2010 by Armin Ronacher and contributors
-license_text_file: MarkupSafe.LICENSE
+license_file: MarkupSafe.LICENSE
 homepage_url: https://github.com/pallets/markupsafe
diff --git a/thirdparty/prod/backports.csv.ABOUT b/thirdparty/prod/backports.csv.ABOUT
@@ -3,7 +3,7 @@ version: 1.0.5
 download_url: https://pypi.python.org/packages/23/01/0b1fce3fd8199fe32338dc66747baad52c7183b7f587128bc77cefde0620/backports.csv-1.0.5-py2.py3-none-any.whl#md5=2b3dc8b5ca0a6f50ed50595a074ed870
 
 name: backports.csv
-homepage: https://github.com/ryanhiebert/backports.csv
+homepage_url: https://github.com/ryanhiebert/backports.csv
 owner: Ryan Hiebert
 
 license: python
diff --git a/thirdparty/prod/boolean.py.ABOUT b/thirdparty/prod/boolean.py.ABOUT
@@ -5,7 +5,7 @@ download_url: https://pypi.python.org/packages/80/f3/0508ae7ba76b02f7fd666b70576
 name: boolean.py
 
 copyright: Copyright (c) 2009-2016 Sebastian Kraemer, basti.kr@gmail.com and others
-dje_license: bsd-simplified
-license_text_file: boolean.py.LICENSE
+license_expression: bsd-simplified
+license_file: boolean.py.LICENSE
 
 homepage_url: https://github.com/bastikr/boolean.py
diff --git a/thirdparty/prod/click.ABOUT b/thirdparty/prod/click.ABOUT
@@ -5,7 +5,7 @@ name: click
 
 owner: Armin Ronacher
 contact: armin.ronacher@active-4.com
-homepage:http://click.pocoo.org/
+homepage_url: http://click.pocoo.org/
 vcs_tool: git
 vcs_repository: https://github.com/pallets/click.git
 description: A simple wrapper around optparse for
diff --git a/thirdparty/prod/colorama.ABOUT b/thirdparty/prod/colorama.ABOUT
@@ -6,7 +6,7 @@ name: colorama
 description: Cross-platform colored terminal text
 homepage_url: https://pypi.python.org/pypi/colorama
 owner: Jonathan Hartley
-dje_license: bds-new
+license_expression: bds-new
 keywords: color colour terminal text ansi windows crossplatform xplatform
-license_text_file: colorama.LICENSE
+license_file: colorama.LICENSE
 copyright: Copyright (c) 2010 Jonathan Hartley
diff --git a/thirdparty/prod/license_expression.ABOUT b/thirdparty/prod/license_expression.ABOUT
@@ -6,7 +6,7 @@ download_url: https://pypi.python.org/packages/d8/a5/24528298829a430d4ace4de39d7
 copyright: Copyright (c) 2017 nexB Inc. and others.
 
 owner: nexB Inc.
-dje_license: apache-2.0
-license_text_file: apache-2.0.LICENSE
+license_expression: apache-2.0
+license_file: apache-2.0.LICENSE
 notice_file: license-expression.NOTICE
 homepage_url: https://github.com/nexB/license-expression
diff --git a/thirdparty/prod/pyyaml.py2.ABOUT b/thirdparty/prod/pyyaml.py2.ABOUT
@@ -9,7 +9,7 @@ copyright: Copyright (c) 2006 Kirill Simonov
 owner: Kirill Simonov
 contact: xi@resolvent.net
 
-dje_license: mit
-license_text_file: pyyaml.LICENSE
+license_expression: mit
+license_file: pyyaml.LICENSE
 
 description: YAML parser and emitter for Python
diff --git a/thirdparty/prod/pyyaml.py3.ABOUT b/thirdparty/prod/pyyaml.py3.ABOUT
@@ -9,7 +9,7 @@ copyright: Copyright (c) 2006 Kirill Simonov
 owner: Kirill Simonov
 contact: xi@resolvent.net
 
-dje_license: mit
-license_text_file: pyyaml.LICENSE
+license_expression: mit
+license_file: pyyaml.LICENSE
 
 description: YAML parser and emitter for Python
diff --git a/thirdparty/prod/pyyaml.tar.ABOUT b/thirdparty/prod/pyyaml.tar.ABOUT
@@ -9,7 +9,7 @@ copyright: Copyright (c) 2006 Kirill Simonov
 owner: Kirill Simonov
 contact: xi@resolvent.net
 
-dje_license: mit
-license_text_file: pyyaml.LICENSE
+license_expression: mit
+license_file: pyyaml.LICENSE
 
 description: YAML parser and emitter for Python
