drop remaining six imports

freeze/tests/fakeserver.py

@@ -1,13 +1,10 @@
 #!/usr/bin/env python
 import json
 import multiprocessing
-import six
 from threading import Thread
-from argparse import ArgumentParser
 from socketserver import TCPServer
 from http.server import SimpleHTTPRequestHandler
-from six.moves import urllib
-
+import urllib.parse
 
 class Handler(SimpleHTTPRequestHandler):
 

requirements.in

@@ -2,10 +2,9 @@ docker
 PyYAML
 requests
 retrying
-six
 toml
 
-click==7.0
+click
 tqdm==4.55.1
 scrapinghub>=2.4
 

requirements.txt

@@ -1,43 +1,43 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
 #
 #    pip-compile
 #
-certifi==2020.6.20
+certifi==2023.11.17
     # via requests
-chardet==3.0.4
+charset-normalizer==3.3.2
     # via requests
-click==7.0
+click==8.1.7
     # via -r requirements.in
-docker==4.2.2
+docker==7.0.0
     # via -r requirements.in
-idna==2.10
+idna==3.6
     # via requests
-pyyaml==5.4
+packaging==23.2
+    # via docker
+pyyaml==6.0.1
     # via -r requirements.in
-requests==2.24.0
+requests==2.31.0
     # via
     #   -r requirements.in
     #   docker
     #   scrapinghub
-retrying==1.3.3
+retrying==1.3.4
     # via
     #   -r requirements.in
     #   scrapinghub
 scrapinghub==2.4.0
     # via -r requirements.in
-six==1.15.0
+six==1.16.0
     # via
-    #   -r requirements.in
-    #   docker
     #   retrying
     #   scrapinghub
-toml==0.10.1
+toml==0.10.2
     # via -r requirements.in
 tqdm==4.55.1
     # via -r requirements.in
-urllib3==1.25.9
-    # via requests
-websocket-client==0.57.0
-    # via docker
+urllib3==2.1.0
+    # via
+    #   docker
+    #   requests

setup.py

@@ -1,4 +1,3 @@
-import io
 import os
 from setuptools import setup, find_packages
 
@@ -35,7 +34,6 @@
         'retrying',
         'requests',
         'scrapinghub>=2.3.1',
-        'six>=1.7.0',
         'tqdm==4.55.1',
         'toml',
     ],

shub/compat.py

@@ -1,6 +1,3 @@
-import six
-
-
 def to_unicode(text, encoding=None, errors='strict'):
     """Return the unicode representation of `text`.
 

shub/config.py

@@ -2,9 +2,9 @@
 import os
 import warnings
 from collections import namedtuple
+from urllib.parse import urlparse, urlunparse
 
 import click
-import six
 import yaml
 
 from shub import DOCS_LINK, CONFIG_DOCS_LINK
@@ -53,9 +53,9 @@ def __init__(self):
     def _check_endpoints(self):
         """Check the endpoints. Send warnings if necessary."""
         for endpoint, url in self.endpoints.items():
-            parsed = six.moves.urllib.parse.urlparse(url)
+            parsed = urlparse(url)
             if parsed.netloc == 'staging.scrapinghub.com':
-                self.endpoints[endpoint] = six.moves.urllib.parse.urlunparse(
+                self.endpoints[endpoint] = urlunparse(
                     parsed._replace(netloc='app.zyte.com')
                 )
                 click.echo(

shub/image/list.py

@@ -3,7 +3,6 @@
 import click
 import docker
 import requests
-from six import string_types
 from urllib.parse import urljoin
 
 from shub.exceptions import ShubException

shub/image/utils.py

@@ -8,7 +8,6 @@
 import click
 import yaml
 from tqdm import tqdm
-from six import binary_type
 import pkg_resources
 
 from shub import config as shub_config

shub/utils.py

@@ -17,7 +17,6 @@
 from importlib import import_module
 from tempfile import NamedTemporaryFile, TemporaryFile
 from urllib.parse import urljoin
-from six import string_types
 
 import click
 import pip

tests/image/test_list.py

@@ -1,7 +1,6 @@
 import json
 from unittest import mock
 
-import six
 import docker
 import pytest
 from click.testing import CliRunner
@@ -33,10 +32,8 @@ def _convert_str(data, to_binary=False):
     to corresponding string or binary representation depending on Python
     version and boolean `to_binary` parameter.
     """
-    if to_binary and six.PY3:
+    if to_binary:
         return data.encode('utf-8')
-    elif not to_binary and six.PY2:
-        return data.decode('utf-8')
     return data
 
 

tests/test_config.py

@@ -4,8 +4,8 @@
 import textwrap
 import unittest
 from unittest import mock
+from io import StringIO
 
-import six
 import yaml
 from click.testing import CliRunner
 from yaml import CLoader as Loader
@@ -87,7 +87,7 @@ class ShubConfigTest(unittest.TestCase):
 
     def _get_conf_with_yml(self, yml):
         conf = ShubConfig()
-        conf.load(six.StringIO(textwrap.dedent(yml)))
+        conf.load(StringIO(textwrap.dedent(yml)))
         return conf
 
     def setUp(self):

tests/test_deploy.py

@@ -8,7 +8,6 @@
 
 import requests
 from click.testing import CliRunner
-from six import string_types
 
 from shub import deploy
 from shub.exceptions import (