Remove direct dependency on six #295

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

etc/scripts/sch2js/sch2js.py

@@ -39,8 +39,6 @@
 """
 
 if __name__ == '__main__':
-
-    from six import iteritems
 
     from schematics.types.base import BaseType
     from schematics.types.compound import ListType
@@ -84,7 +82,7 @@ def jsonschema_for_single_field(field_instance):
             field_schema['title'] = field_instance.metadata.get('label', '')
             field_schema['description'] = field_instance.metadata.get('description', '')
 
-        for js_key, schematic_key in iteritems(schema_kwargs_to_schematics):
+        for js_key, schematic_key in schema_kwargs_to_schematics.items():
             value = getattr(field_instance, schematic_key, None)
             if value is not None:
                 field_schema[js_key] = value
@@ -98,7 +96,7 @@ def jsonschema_for_fields(model):
         """
         properties = {}
         required = []
-        for field_name, field_instance in iteritems(model.fields):
+        for field_name, field_instance in model.fields.items():
             serialized_name = getattr(field_instance, 'serialized_name', None) or field_name
 
             if isinstance(field_instance, ModelType):

setup.py

@@ -90,7 +90,6 @@ def read(*names, **kwargs):
         # textcode
         'Beautifulsoup4 >= 4.0.0, <5.0.0',
         'html5lib',
-        'six',
         'pdfminer.six >= 20170720',
         'pycryptodome >= 3.4',
         'chardet >= 3.0.0, <4.0.0',

src/cluecode/copyrights.py

@@ -31,8 +31,6 @@
 import sys
 from time import time
 
-from six import string_types
-
 from cluecode import copyrights_hint
 from commoncode.text import toascii
 from commoncode.text import unixlinesep
@@ -60,7 +58,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 
 """

src/cluecode/finder.py

@@ -27,7 +27,6 @@
 import re
 
 import ipaddress
-from six import string_types
 import urlpy
 
 from commoncode.text import toascii
@@ -55,7 +54,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 
 """

src/cluecode/plugin_filter_clues.py

@@ -26,7 +26,6 @@
 from itertools import chain
 
 import attr
-from six import string_types
 
 from commoncode.cliutils import PluggableCommandLineOption
 from commoncode.cliutils import POST_SCAN_GROUP
@@ -49,7 +48,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 
 @post_scan_impl

src/cluecode/plugin_ignore_copyrights.py

@@ -25,7 +25,6 @@
 
 import re
 
-from six import string_types
 
 from commoncode.cliutils import PluggableCommandLineOption
 from commoncode.cliutils import OUTPUT_FILTER_GROUP
@@ -48,7 +47,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 
 @output_filter_impl

src/formattedcode/output_csv.py

@@ -25,7 +25,6 @@
 
 
 import saneyaml
-from six import string_types
 import unicodecsv
 
 from formattedcode import FileOptionType
@@ -52,7 +51,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types)
+        return logger.debug(' '.join(isinstance(a, str)
                                      and a or repr(a) for a in args))
 
 
@@ -229,7 +228,7 @@ def pretty(data):
     maptypes = dict, dict
     coltypes = seqtypes + maptypes
     if isinstance(data, seqtypes):
-        if len(data) == 1 and isinstance(data[0], string_types):
+        if len(data) == 1 and isinstance(data[0], str):
             return data[0].strip()
     if isinstance(data, coltypes):
         return saneyaml.dump(

src/formattedcode/output_json.py

@@ -25,7 +25,6 @@
 
 
 import jsonstreams
-from six import string_types
 
 from formattedcode import FileOptionType
 from commoncode.cliutils import PluggableCommandLineOption
@@ -55,7 +54,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types)
+        return logger.debug(' '.join(isinstance(a, str)
                                      and a or repr(a) for a in args))
 
 
@@ -113,7 +112,7 @@ def write_results(codebase, output_file, pretty=False, **kwargs):
 
     # If `output_file` is a path string, open the file at path `output_file` and use it as `output_file`
     close_fd = False
-    if isinstance(output_file, string_types):
+    if isinstance(output_file, str):
         output_file = open(output_file, 'w')
         close_fd = True
 

src/formattedcode/output_spdx.py

@@ -35,7 +35,6 @@
 except ImportError:
     from io import StringIO
 
-from six import string_types
 from spdx.checksum import Algorithm
 from spdx.creationinfo import Tool
 from spdx.document import Document
@@ -71,7 +70,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types)
+        return logger.debug(' '.join(isinstance(a, str)
                                      and a or repr(a) for a in args))
 
 """

src/licensedcode/cache.py

@@ -31,7 +31,6 @@
 from os.path import join
 import sys
 
-import six
 import yg.lockfile  # NOQA
 
 from commoncode.fileutils import resource_iter

src/licensedcode/index.py

@@ -39,7 +39,6 @@
 from time import time
 
 from intbitset import intbitset
-from six import string_types
 
 from commoncode.dict_utils import sparsify
 from licensedcode import MAX_DIST
@@ -91,7 +90,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a)
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a)
                                      for a in args))
 
 

src/licensedcode/match.py

@@ -27,7 +27,6 @@
 from itertools import groupby
 
 import attr
-from six import string_types
 
 from licensedcode import MAX_DIST
 from licensedcode import query
@@ -86,7 +85,7 @@ def logger_debug(*args): pass
     logger = logging.getLogger(__name__)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)

src/licensedcode/match_aho.py

@@ -26,7 +26,6 @@
 from itertools import groupby
 
 import ahocorasick
-from six import string_types
 
 from licensedcode import SMALL_RULE
 from licensedcode.match import LicenseMatch
@@ -48,7 +47,7 @@
     logger = logging.getLogger(__name__)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)

src/licensedcode/match_hash.py

@@ -26,7 +26,6 @@
 from array import array
 from hashlib import md5
 
-from six import string_types
 
 from licensedcode.match import LicenseMatch
 from licensedcode.spans import Span
@@ -45,7 +44,7 @@
     logger = logging.getLogger(__name__)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
     # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
     logging.basicConfig(stream=sys.stdout)

src/licensedcode/match_seq.py

@@ -26,7 +26,6 @@
 from time import time
 import sys
 
-from six import string_types
 
 from licensedcode.match import LicenseMatch
 from licensedcode.spans import Span
@@ -46,7 +45,7 @@ def logger_debug(*args): pass
     logger = logging.getLogger(__name__)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)

src/licensedcode/match_set.py

@@ -29,7 +29,6 @@
 from itertools import groupby
 
 from intbitset import intbitset
-from six import string_types
 
 from commoncode.dict_utils import sparsify
 from licensedcode.tokenize import ngrams
@@ -122,7 +121,7 @@ def logger_debug(*args): pass
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 
 def tids_sets_intersector(qset, iset):

src/licensedcode/match_spdx_lid.py

@@ -32,7 +32,6 @@
 from license_expression import LicenseSymbol
 from license_expression import LicenseWithExceptionSymbol
 from license_expression import Licensing
-from six import string_types
 
 from licensedcode.match import LicenseMatch
 from licensedcode.models import SpdxRule
@@ -70,7 +69,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 
 MATCH_SPDX_ID = '1-spdx-id'

src/licensedcode/plugin_license_text.py

@@ -24,7 +24,6 @@
 
 
 import attr
-from six import string_types
 
 from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
@@ -42,7 +41,7 @@
     logger = logging.getLogger(__name__)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)

src/licensedcode/query.py

@@ -30,7 +30,6 @@
 import re
 
 from intbitset import intbitset
-from six import string_types
 
 from commoncode.text import toascii
 from licensedcode.spans import Span
@@ -102,7 +101,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 # for the cases of very long lines, we break in abritrary pseudo lines at 25
 # tokens to avoid getting huge query runs for texts on a single line (e.g.

src/packagedcode/about.py

@@ -28,7 +28,6 @@
 
 import attr
 import saneyaml
-from six import string_types
 
 from commoncode import filetype
 from packagedcode import models
@@ -102,7 +101,7 @@ def build_package(package_data):
     copyright_statement = package_data.get('copyright')
 
     owner = package_data.get('owner')
-    if not isinstance(owner, string_types):
+    if not isinstance(owner, str):
         owner = repr(owner)
     parties = [models.Party(type=models.party_person, name=owner, role='owner')]
 

src/packagedcode/bower.py

@@ -30,7 +30,6 @@
 
 import attr
 from packageurl import PackageURL
-from six import string_types
 
 from commoncode import filetype
 from commoncode import ignore
@@ -96,7 +95,7 @@ def build_package(package_data):
     version = package_data.get('version')
     declared_license = package_data.get('license')
     if declared_license:
-        if isinstance(declared_license, string_types):
+        if isinstance(declared_license, str):
             declared_license = [declared_license]
         elif isinstance(declared_license, (list, tuple)):
             declared_license = [l for l in declared_license if l and l.strip()]
@@ -115,7 +114,7 @@ def build_package(package_data):
             url = author.get('homepage')
             party = models.Party(name=name, role='author', email=email, url=url)
             parties.append(party)
-        elif isinstance(author, string_types):
+        elif isinstance(author, str):
             parties.append(models.Party(name=author, role='author'))
         else:
             parties.append(models.Party(name=repr(author), role='author'))

src/packagedcode/conda.py

@@ -28,7 +28,6 @@
 import sys
 
 import attr
-from six import string_types
 
 from commoncode import filetype
 from commoncode import fileutils
@@ -57,7 +56,7 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, string_types) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
 
 @attr.s()