Use unicode everywhere, cleanup imports #280

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/attributecode/__init__.py

@@ -17,16 +17,18 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 from collections import namedtuple
 import logging
 
+
 __version__ = '3.0.0.dev5'
 
 __about_spec_version__ = '2.0.0.dev2'
 
 __copyright__ = """
-Copyright (c) 2013-2016 nexB Inc. All rights reserved. http://dejacode.org
+Copyright (c) 2013-2017 nexB Inc. All rights reserved. http://dejacode.org
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at

src/attributecode/__main__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf8 -*-
 
 # ============================================================================
-#  Copyright (c) 2013-2015 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2013-2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
@@ -14,6 +14,10 @@
 #  limitations under the License.
 # ============================================================================
 
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
 
 if __name__ == '__main__':
     from attributecode import cmd

src/attributecode/api.py

@@ -16,10 +16,11 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
+from collections import namedtuple
 import json
 import urllib
-from collections import namedtuple
 
 try:
     import httplib  # Python 2

src/attributecode/attrib.py

@@ -16,16 +16,18 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import codecs
 import collections
-import jinja2
 import os
 from posixpath import basename
 from posixpath import dirname
 from posixpath import exists
 from posixpath import join
 
+import jinja2
+
 import attributecode
 from attributecode import ERROR
 from attributecode import Error
@@ -73,7 +75,7 @@ def generate(abouts, template_string=None):
             if about.license_expression.value and about.license_name.value:
                 # Split the license expression into list with license key and condition keyword
                 lic_expression_list = about.license_expression.value.split()
-                
+
 
                 lic_name_list = about.license_name.value
                 lic_name_expression_list = []
@@ -96,7 +98,7 @@ def generate(abouts, template_string=None):
                 lic_name_expression = ' '.join(lic_name_expression_list)
 
                 # Add the license name expression string into the about object
-                about.license_name_expression = lic_name_expression 
+                about.license_name_expression = lic_name_expression
 
         rendered = template.render(abouts=abouts, common_licenses=COMMON_LICENSES, license_key_and_context=sorted_license_key_and_context,
                                    license_file_name_and_key=license_file_name_and_key, license_key_to_license_name=license_key_to_license_name)

src/attributecode/cmd.py

@@ -16,30 +16,31 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import codecs
 import logging
 import os
 from os.path import exists, join
+import sys
 
 import click
 import unicodecsv
-import sys
 
 import attributecode
 from attributecode import CRITICAL
 from attributecode import ERROR
 from attributecode import INFO
 from attributecode import NOTSET
 from attributecode import WARNING
-from attributecode import Error
 from attributecode import __about_spec_version__
 from attributecode import __version__
 from attributecode import attrib
+from attributecode import Error
 from attributecode import gen
 from attributecode import model
-from attributecode import severities
 from attributecode.model import About
+from attributecode import severities
 from attributecode.util import extract_zip
 from attributecode.util import to_posix
 

src/attributecode/gen.py

@@ -16,21 +16,21 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import codecs
 from collections import OrderedDict
 import logging
 import posixpath
-import unicodecsv
 
+import unicodecsv
 
 from attributecode import ERROR
 from attributecode import CRITICAL
 from attributecode import Error
 from attributecode import model
-from attributecode import util
-from attributecode.model import verify_license_files_in_location
 from attributecode.model import check_file_field_exist
+from attributecode import util
 from attributecode.util import add_unc
 from attributecode.util import to_posix
 

src/attributecode/licenses.py

@@ -2,7 +2,7 @@
 # -*- coding: utf8 -*-
 
 # ============================================================================
-#  Copyright (c) 2013-2016 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2013-2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
@@ -14,6 +14,10 @@
 #  limitations under the License.
 # ============================================================================
 
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
 # Common license keys
 COMMON_LICENSES = (
     'aes-128-3.0',

src/attributecode/model.py

@@ -14,26 +14,30 @@
 # ============================================================================
 
 """
-AboutCode is a tool to process ABOUT files. ABOUT files are small text files
-that document the provenance (aka. the origin and license) of software
-components as well as the essential obligation such as attribution/credits and
-source code redistribution. See the ABOUT spec at http://dejacode.org.
-
-AbouCode reads and validates ABOUT files and collect software components
-inventories.
+AboutCode toolkit is a tool to process ABOUT files. ABOUT files are
+small text files that document the provenance (aka. the origin and
+license) of software components as well as the essential obligation
+such as attribution/credits and source code redistribution. See the
+ABOUT spec at http://dejacode.org.
+
+AboutCode toolkit reads and validates ABOUT files and collect software
+components inventories.
 """
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
+from collections import OrderedDict
 import codecs
 import json
 import os
 import posixpath
+from posixpath import dirname
 import re
+
+from license_expression import Licensing
 import unicodecsv
-from collections import OrderedDict
-from posixpath import dirname
 
 try:
     import urllib2  # Python 2
@@ -52,14 +56,17 @@
 
 from attributecode import CRITICAL
 from attributecode import ERROR
-from attributecode import Error
 from attributecode import INFO
 from attributecode import WARNING
 from attributecode import api
+from attributecode import Error
 from attributecode import saneyaml
 from attributecode import util
-from attributecode.util import add_unc, UNC_PREFIX, UNC_PREFIX_POSIX, on_windows, copy_license_notice_files
-from license_expression import Licensing
+from attributecode.util import add_unc
+from attributecode.util import copy_license_notice_files
+from attributecode.util import on_windows
+from attributecode.util import UNC_PREFIX
+from attributecode.util import UNC_PREFIX_POSIX
 
 
 class Field(object):
@@ -384,7 +391,7 @@ def _validate(self, *args, **kwargs):
 
         name = self.name
         # FIXME: This is a temp fix for #286
-        # The field in ignore_checking_list is validated in the check_file_field_exist function 
+        # The field in ignore_checking_list is validated in the check_file_field_exist function
         ignore_checking_list = [u'license_file', u'notice_file', u'changelog_file']
         # mapping of normalized paths to a location or None
         paths = OrderedDict()
@@ -648,7 +655,7 @@ def create_fields(self):
         """
         self.fields = OrderedDict([
             ('about_resource', ListField(required=True)),
-            #('about_resource', AboutResourceField(required=True)),
+            # ('about_resource', AboutResourceField(required=True)),
             ('name', SingleLineField(required=True)),
             ('about_resource_path', AboutResourceField()),
 
@@ -822,7 +829,7 @@ def as_dict(self, with_paths=False, with_absent=True, with_empty=True):
                 # Return an empty 'about_resource_path' if the 'about_resource'
                 # key is not found
                 else:
-                    as_dict[arpa] = '' 
+                    as_dict[arpa] = ''
 
         for field in self.all_fields(with_absent=with_absent,
                                      with_empty=with_empty):
@@ -1211,7 +1218,7 @@ def field_names(abouts, with_paths=True, with_absent=True, with_empty=True):
     fields = []
     if with_paths:
         fields.append(About.about_file_path_attr)
-        #fields.append(About.about_resource_path_attr)
+        # fields.append(About.about_resource_path_attr)
 
     standard_fields = About().fields.keys()
     if with_absent:

src/attributecode/saneyaml.py

@@ -2,7 +2,7 @@
 # -*- coding: utf8 -*-
 
 # ============================================================================
-#  Copyright (c) 2015-2016 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2015-2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
@@ -14,14 +14,15 @@
 #  limitations under the License.
 # ============================================================================
 
-
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 from collections import OrderedDict
 from functools import partial
 
 import yaml
+
 try:
     from yaml import CSafeLoader as SafeLoader
     from yaml import CSafeDumper as SafeDumper

src/attributecode/util.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf8 -*-
 # ============================================================================
-#  Copyright (c) 2013-2016 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2013-2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
@@ -15,29 +15,32 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
+from collections import OrderedDict
 import codecs
 import errno
 import json
 import ntpath
 import os
+from os.path import abspath
+from os.path import dirname
+from os.path import join
 import posixpath
 import shutil
 import socket
 import string
 import sys
+
 import unicodecsv
-from collections import OrderedDict
-from os.path import abspath
-from os.path import dirname
-from os.path import join
 
 try:
     import httplib  # Python 2
 except ImportError:
     import http.client as httplib  # Python 3
 
-from attributecode import CRITICAL, Error
+from attributecode import CRITICAL
+from attributecode import Error
 
 
 on_windows = 'win32' in sys.platform
@@ -197,7 +200,7 @@ def norm(p):
         relative = path[len(base) + 1:]
         # We don't want to keep the first segment of the root of the returned path.
         # See https://github.com/nexB/attributecode/issues/276
-        #relative = posixpath.join(base_name, relative)
+        # relative = posixpath.join(base_name, relative)
     return relative