Update changelog

Signed-off-by:

Author: chinyeungli

.gitignore

@@ -47,3 +47,5 @@ docs/_build
 /.cache/
 /.settings/
 /tcl/
+/.python-version
+/.tox/

.travis.yml

@@ -8,7 +8,7 @@ install:
     - ./configure etc/conf/dev
 
 script:
-    - bin/py.test -vvs tests
+    - bin/py.test -vvs
 
 notifications:
     irc:

README.rst

@@ -64,9 +64,10 @@ or on windows::
     configure
 
 
-USAGE
+REFERENCE
 -----
-See https://github.com/nexB/aboutcode-toolkit/blob/master/USAGE.rst for USAGE.
+See https://github.com/nexB/aboutcode-toolkit/blob/master/REFERENCE.rst for reference
+on aboutcode-toolkit usage.
 
 
 TESTS and DEVELOPMENT
@@ -121,4 +122,4 @@ See (of course) the about.ABOUT file for details.
     :alt: Windows Master branch tests status
 .. |devel-win| image:: https://ci.appveyor.com/api/projects/status/uwj2gh8i9ga1mqwn/branch/develop?png=true
     :target: https://ci.appveyor.com/project/nexB/aboutcode-toolkit
-    :alt: Windows Develop branch tests status
+    :alt: Windows Develop branch tests status

about.cfg

@@ -21,7 +21,8 @@ fi
 
 CONFIGURE_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-python "$CONFIGURE_ROOT_DIR/etc/configure.py" $CFG_CMD_LINE_ARGS
-if [ -f "$CONFIGURE_ROOT_DIR/bin/activate" ]; then
-    source $CONFIGURE_ROOT_DIR/bin/activate
+if [[ "$PYTHON_EXE" == "" ]]; then
+    PYTHON_EXE=python
 fi
+
+$PYTHON_EXE "$CONFIGURE_ROOT_DIR/etc/configure.py" $CFG_CMD_LINE_ARGS

configure

@@ -1,5 +1,8 @@
-2018-xx-xx
+2018-XX-XX
 
+    Release 3.4.0.pre1
+
+    * Support filenames/path with spaces #310
     * Update ABOUT file format to match the specification
 
 2018-11-15

docs/CHANGELOG.rst

@@ -14,3 +14,22 @@ licenses:
         url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:gpl-2.0
 notice_file: irc-notify.py.NOTICE
 owner: Christopher R. Wood
+<<<<<<< HEAD
+=======
+copyright: Copyright (C) 2015-2016 Christopher R. Wood
+license_expression: gpl-2.0-plus
+license_text_file: gpl-2.0.LICENSE
+notice_text: |
+    This program is free software; you can redistribute it and/or modify it under the
+    terms of the GNU General Public License as published by the Free Software
+    Foundation; either version 2 of the License, or (at your option) any later
+    version.
+    
+    This program is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+    PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License along with this
+    program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+    Fifth Floor, Boston, MA 02110-1301 USA.
+>>>>>>> branch 'v3-maintenance' of https://github.com/nexB/aboutcode-toolkit.git

etc/scripts/irc-notify.py.ABOUT

@@ -10,24 +10,23 @@ release = clean --all sdist --formats=bztar,zip bdist_wheel
 [tool:pytest]
 norecursedirs =
     .git
+    .cache
+    .settings
     bin
     dist
+    dist
     build
     _build
-    dist
-    local
-    ci
     docs
     man
     share
-    samples
-    .cache
-    .settings
+    example
     etc
     Include
     include
     Lib
     lib
+    local
     Scripts
     thirdparty
     tmp

setup.cfg

@@ -24,7 +24,7 @@ def read(*names, **kwargs):
 
 setup(
     name='aboutcode-toolkit',
-    version='3.3.0',
+    version='3.4.0.pre1',
     license='Apache-2.0',
     description=(
         'AboutCode-toolkit is a tool to document the provenance (origin and license) of '
@@ -68,9 +68,15 @@ def read(*names, **kwargs):
     ],
     install_requires=[
         'jinja2 >= 2.9, < 3.0',
+
         'click >= 6.7, < 7.0',
+
         "backports.csv ; python_version<'3.6'",
-        'PyYAML >= 3.0, < 4.0',
+
+        # required by saneyaml
+        'PyYAML >= 3.11, <=3.13',
+        'saneyaml',
+
         'boolean.py >= 3.5, < 4.0',
         'license_expression >= 0.94, < 1.0',
     ],
@@ -79,7 +85,7 @@ def read(*names, **kwargs):
     },
     entry_points={
         'console_scripts': [
-            'about=attributecode.cmd:cli',
+            'about=attributecode.cmd:about',
         ]
     },
 )

setup.py

@@ -20,15 +20,18 @@
 
 from collections import namedtuple
 import logging
+import os
 
 try:
-    basestring  # Python 2
-except NameError:
-    basestring = str  # Python 3 #NOQA
+    # Python 2
+    unicode  # NOQA
+except NameError:  # pragma: nocover
+    # Python 3
+    unicode = str  # NOQA
 
+import saneyaml
 
-__version__ = '3.3.0'
-
+__version__ = '3.4.0.pre1'
 
 __about_spec_version__ = '3.1'
 
@@ -52,39 +55,58 @@ class Error(namedtuple('Error', ['severity', 'message'])):
     """
     def __new__(self, severity, message):
         if message:
-            if isinstance(message, basestring):
-                message = clean_string(message)
+            if isinstance(message, unicode):
+                message = self._clean_string(message)
             else:
-                message = clean_string(repr(message))
+                message = self._clean_string(unicode(repr(message), encoding='utf-8'))
+                message = message.strip('"')
 
         return super(Error, self).__new__(
             Error, severity, message)
 
     def __repr__(self, *args, **kwargs):
-        sev = severities[self.severity]
-        msg = clean_string(repr(self.message))
-        return 'Error(%(sev)s, %(msg)s)' % locals()
+        sev, msg = self._get_values()
+        return 'Error(%(sev)s,  %(msg)s)' % locals()
 
+    def __eq__(self, other):
+        return repr(self) == repr(other)
 
-def clean_string(s):
-    """
-    Return a cleaned string for `s`, stripping eventual "u" prefixes
-    from unicode representations.
-    """
-    if not s:
+    def _get_values(self):
+        sev = severities[self.severity]
+        msg = self._clean_string(repr(self.message))
+        return sev, msg
+
+    def render(self):
+        sev, msg = self._get_values()
+        return '%(sev)s: %(msg)s' % locals()
+
+    def to_dict(self, *args, **kwargs):
+        """
+        Return an ordered dict of self.
+        """
+        return self._asdict()
+
+    @staticmethod
+    def _clean_string(s):
+        """
+        Return a cleaned string for `s`, stripping eventual "u" prefixes
+        from unicode representations.
+        """
+        if not s:
+            return s
+        if s.startswith(('u"', "u'")):
+            s = s.lstrip('u')
+        s = s.replace('[u"', '["')
+        s = s.replace("[u'", "['")
+        s = s.replace("(u'", "('")
+        s = s.replace("(u'", "('")
+        s = s.replace("{u'", "{'")
+        s = s.replace("{u'", "{'")
+        s = s.replace(" u'", " '")
+        s = s.replace(" u'", " '")
+        s = s.replace("\\\\", "\\")
         return s
-    if s.startswith(('u"', "u'")):
-        s = s.lstrip('u')
-    s = s.replace('[u"', '["')
-    s = s.replace("[u'", "['")
-    s = s.replace("(u'", "('")
-    s = s.replace("(u'", "('")
-    s = s.replace("{u'", "{'")
-    s = s.replace("{u'", "{'")
-    s = s.replace(" u'", " '")
-    s = s.replace(" u'", " '")
-    s = s.replace("\\\\", "\\")
-    return s
+
 
 # modeled after the logging levels
 CRITICAL = 50
@@ -96,10 +118,10 @@ def clean_string(s):
 
 
 severities = {
-    CRITICAL : u'CRITICAL',
-    ERROR : u'ERROR',
-    WARNING : u'WARNING',
-    INFO : u'INFO',
-    DEBUG : u'DEBUG',
-    NOTSET : u'NOTSET'
-    }
+    CRITICAL : 'CRITICAL',
+    ERROR : 'ERROR',
+    WARNING : 'WARNING',
+    INFO : 'INFO',
+    DEBUG : 'DEBUG',
+    NOTSET : 'NOTSET'
+}