Remove six references.

Author: mikaelfrykholm

src/pyff/api.py

@@ -15,7 +15,6 @@
 from pyramid.events import NewRequest
 from pyramid.request import Request
 from pyramid.response import Response
-from six import b
 from urllib.parse import quote_plus
 
 from pyff.constants import config
@@ -464,7 +463,7 @@ def _response() -> Generator[bytes, bytes, None]:
         for e in entities:
             if in_loop:
                 yield b','
-            yield b(dumps(e))
+            yield dumps(e)
             in_loop = True
         yield b']'
 

src/pyff/builtins.py

@@ -1630,8 +1630,6 @@ def emit(req: Plumbing.Request, ctype="application/xml", *opts):
         raise PipeException("Empty")
 
     req.state['headers']['Content-Type'] = ctype
-    if six.PY2:
-        d = d
     return d
 
 

src/pyff/constants.py

@@ -11,7 +11,6 @@
 from str2bool import str2bool
 
 import pyconfig
-import six
 
 from pyff import __version__ as pyff_version
 

src/pyff/exceptions.py

@@ -1,5 +1,4 @@
 __author__ = 'leifj'
-import six
 
 
 class PyffException(BaseException):

src/pyff/mdq.py

@@ -7,7 +7,6 @@
 import os
 
 import gunicorn.app.base
-from six import iteritems
 
 from pyff.api import mkapp
 from pyff.constants import config, parse_options

src/pyff/store.py

@@ -9,7 +9,6 @@
 from threading import ThreadError
 
 import ipaddress
-import six
 from cachetools.func import ttl_cache
 from redis_collections import Dict, Set
 from whoosh.fields import ID, KEYWORD, NGRAMWORDS, Schema
@@ -756,7 +755,7 @@ def lookup(self, key):
         if key == 'entities' or key is None:
             return self._entities()
 
-        bkey = six.b(key)
+        bkey = key.encode('latin-1')
         if bkey in self.objects:
             return [self.objects.get(bkey)]
 

src/pyff/utils.py

@@ -313,9 +313,6 @@ def safe_write(fn, data, mkdirs=False):
             data = data.decode('utf-8')
 
         with tempfile.NamedTemporaryFile(mode, **kwargs) as tmp:
-            if six.PY2:
-                data = data.encode('utf-8')
-
             log.debug(f"safe writing {len(data)} chrs into {fn}")
             tmp.write(data)
             tmpn = tmp.name
@@ -679,7 +676,7 @@ def send(self, request, **kwargs):
         (_, _, _dir) = request.url.partition('://')
         if _dir is None or len(_dir) == 0:
             raise ValueError(f"not a directory url: {request.url}")
-        resp.raw = six.BytesIO(six.b(_dir))
+        resp.raw = io.BytesIO(_dir.encode("latin-1"))
         resp.status_code = 200
         resp.reason = "OK"
         resp.headers = {}
@@ -727,9 +724,6 @@ def url_get(url: str, verify_tls: Optional[bool] = False) -> Response:
         s = requests.Session()
         r = s.get(url, headers=headers, verify=verify_tls, timeout=config.request_timeout)
 
-    if six.PY2:
-        r.encoding = "utf-8"
-
     log.debug(f"url_get({url}) returns {len(r.content)} chrs encoded as {r.encoding}")
 
     if config.request_override_encoding is not None:
@@ -788,7 +782,7 @@ def short_id(data):
 
 
 def unicode_stream(data: str) -> io.BytesIO:
-    return six.BytesIO(data.encode('UTF-8'))
+    return io.BytesIO(data.encode('UTF-8'))
 
 
 def b2u(data: Union[str, bytes, tuple, list, set]) -> Union[str, bytes, tuple, list, set]: