Drop six and any remaining mentions of Python 2

Author: ntninja

docs/releasing.md

@@ -7,7 +7,7 @@ All of this has only been tested on Debian 11 (Linux).
 
 ## Building and updating the project
 
-### Python 3 with the `flit` project manager
+### The `flit` project manager
 
 APT line: `sudo apt install python3-pip && sudo pip3 install flit`  
 DNF line: `sudo dnf install python3-flit`

ipfshttpclient/client/base.py

@@ -1,7 +1,5 @@
 import functools
 
-import six
-
 from . import DEFAULT_ADDR, DEFAULT_BASE
 
 from .. import multipart, http

ipfshttpclient/encoding.py

@@ -10,8 +10,6 @@
 import codecs
 import json
 
-import six
-
 from . import exceptions
 
 
@@ -123,7 +121,7 @@ def encode(self, obj):
 		-------
 			bytes
 		"""
-		return six.b(str(obj))
+		return str(obj).encode()
 
 
 class Json(Encoding):
@@ -149,7 +147,7 @@ def parse_partial(self, data):
 			generator
 		"""
 		try:
-			# Python 3 requires all JSON data to be a text string
+			# Python requires all JSON data to text strings
 			lines = self._decoder1.decode(data, False).split("\n")
 
 			# Add first input line to last buffer line, if applicable, to

ipfshttpclient/http.py

@@ -6,15 +6,14 @@
 
 import abc
 import functools
+import http.client
 import tarfile
-from six.moves import http_client
 import os
 import socket
 import urllib.parse
 
 import multiaddr
 from multiaddr.protocols import (P_DNS, P_DNS4, P_DNS6, P_HTTP, P_HTTPS, P_IP4, P_IP6, P_TCP)
-import six
 
 from . import encoding
 from . import exceptions
@@ -248,7 +247,7 @@ def _do_request(self, *args, **kwargs):
 			raise exceptions.TimeoutError(error) from error
 		except requests.ConnectionError as error:
 			raise exceptions.ConnectionError(error) from error
-		except http_client.HTTPException as error:
+		except http.client.HTTPException as error:
 			raise exceptions.ProtocolError(error) from error
 
 	def _do_raise_for_status(self, response):

ipfshttpclient/multipart.py

@@ -5,11 +5,9 @@
 import inspect
 import os
 import re
-from six.moves import urllib
+import urllib.parse
 import uuid
 
-import six
-
 from . import utils
 
 
@@ -34,7 +32,7 @@ def content_disposition_headers(filename, disptype="form-data"):
 	disptype : str
 		Rhe disposition type to use for the file
 	"""
-	disp = '{}; filename="{}"'.format(
+	disp = '{0}; filename="{1}"'.format(
 		disptype,
 		urllib.parse.quote(filename, safe='')
 	)
@@ -604,8 +602,8 @@ def stream_directory_impl(directory, dirname=None):
 		                         dirname=dirname, chunk_size=chunk_size)
 		return stream.body(), stream.headers()
 
-	# Note that `os.fwalk` is never available on Windows and Python 2
-	if hasattr(os, "fwalk") and not isinstance(directory, int):  #PY3
+	# Note that `os.fwalk` is never available on Windows
+	if hasattr(os, "fwalk") and not isinstance(directory, int):
 		def auto_close_iter_fd(fd, iter):
 			try:
 				yield from iter

ipfshttpclient/utils.py

@@ -5,7 +5,6 @@
 import collections.abc
 import mimetypes
 import os
-import six
 from functools import wraps
 
 

pyproject.toml

@@ -12,11 +12,10 @@ keywords     = "ipfs storage distribution development"
 license      = "MIT License"
 description-file = "README.md"
 
-requires-python = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
+requires-python = ">=3.5"
 requires = [
 	"multiaddr (>=0.0.7)",
-	"requests (>=2.11)",
-	"six"
+	"requests (>=2.11)"
 ]
 
 classifiers = [
@@ -37,10 +36,7 @@ classifiers = [
 
 	# Specify the Python versions you support here. In particular, ensure
 	# that you indicate whether you support Python 2, Python 3 or both.
-	"Programming Language :: Python :: 2",
-	"Programming Language :: Python :: 2.7",
-	"Programming Language :: Python :: 3",
-	"Programming Language :: Python :: 3.4",
+	"Programming Language :: Python :: 3 :: Only",
 	"Programming Language :: Python :: 3.5",
 	"Programming Language :: Python :: 3.6",
 	"Programming Language :: Python :: 3.7",

test/functional/test_block.py

@@ -1,7 +1,4 @@
-try:
-	import cid
-except ImportError:
-	cid = None
+import cid
 import io
 import pytest
 
@@ -48,7 +45,6 @@ def test_put_str(client):
 	assert res["Key"] == TEST2_CID_STR
 
 
-@pytest.mark.skipif(not cid, reason="requires py-cid (Python 3.5+ only)")
 @pytest.mark.run(after="test_put_str")
 def test_stat_cid_obj(client):
 	assert len(client.block.get(TEST2_CID_OBJ)) == TEST2_SIZE

test/functional/test_files.py

@@ -2,10 +2,7 @@
 import shutil
 
 import pytest
-try:
-	import pytest_cid
-except ImportError:
-	pytest_cid = None
+import pytest_cid
 
 import ipfshttpclient.exceptions
 
@@ -112,14 +109,13 @@
 
 
 def calc_path_rel_to_cwd(p):
-	p = str(p)  # for Python < 3.5
+	p = str(p)  # PY35
 	prefix = os.path.commonprefix([p, os.getcwd()])
 	relpath = os.path.relpath(p, prefix)
 	assert not os.path.isabs(relpath)
 	return relpath
 
 
-@pytest.mark.skipif(not pytest_cid, reason="requires pytest-cid (Python 3.5+ only)")
 def test_add_single_from_str_with_dir(client, cleanup_pins):
 	res = client.add(FAKE_FILE1_PATH, wrap_with_directory=True)
 
@@ -132,7 +128,6 @@ def test_add_single_from_str_with_dir(client, cleanup_pins):
 	assert dir_hash in client.pin.ls(type="recursive")["Keys"]
 
 
-@pytest.mark.skipif(not pytest_cid, reason="requires pytest-cid (Python 3.5+ only)")
 def test_only_hash_file(client):
 	client.repo.gc()
 
@@ -144,13 +139,11 @@ def test_only_hash_file(client):
 	assert res["Hash"] not in list(map(lambda i: i["Ref"], client.unstable.refs.local()))
 
 
-@pytest.mark.skipif(not pytest_cid, reason="requires pytest-cid (Python 3.5+ only)")
 def test_add_multiple_from_list(client, cleanup_pins):
 	res = client.add(FAKE_FILE1_PATH, FAKE_FILE2_PATH)
 	assert pytest_cid.match(FAKE_FILES_HASH) == res
 
 
-@pytest.mark.skipif(not pytest_cid, reason="requires pytest-cid (Python 3.5+ only)")
 def test_add_with_raw_leaves(client, cleanup_pins):
 	res = client.add(FAKE_FILE1_PATH, raw_leaves=True)
 	check_add_with_raw_leaves(client, res)
@@ -188,7 +181,6 @@ def check_no_copy(client, res):
 	# TODO: assert client.filestore.verify(res["Hash"])["Status"] == 0
 
 
-@pytest.mark.skipif(not pytest_cid, reason="requires pytest-cid (Python 3.5+ only)")
 def test_add_relative_path(client, cleanup_pins):
 	res = client.add(calc_path_rel_to_cwd(FAKE_FILE1_PATH))
 	assert pytest_cid.match(FAKE_FILE1_HASH) == res

test/unit/test_encoding.py

@@ -2,7 +2,6 @@
 import json
 
 import pytest
-import six
 
 import ipfshttpclient.encoding
 import ipfshttpclient.exceptions
@@ -17,7 +16,7 @@ def json_encoder():
 def test_json_parse(json_encoder):
 	"""Asserts parsed key/value json matches expected output."""
 	data = {'key': 'value'}
-	raw = six.b(json.dumps(data))
+	raw = json.dumps(data).encode("utf-8")
 	res = json_encoder.parse(raw)
 	assert res['key'] == 'value'
 
@@ -28,13 +27,13 @@ def test_json_parse_partial(json_encoder):
 	data2 = {'key2': 'value2'}
 
 	# Try single fragmented data set
-	data1_binary = six.b(json.dumps(data1))
+	data1_binary = json.dumps(data1).encode("utf-8")
 	assert list(json_encoder.parse_partial(data1_binary[:8])) == []
 	assert list(json_encoder.parse_partial(data1_binary[8:])) == [data1]
 	assert list(json_encoder.parse_finalize()) == []
 
 	# Try multiple data sets contained in whitespace
-	data2_binary = six.b(json.dumps(data2))
+	data2_binary = json.dumps(data2).encode("utf-8")
 	data2_final  = b"  " + data1_binary + b"  \r\n  " + data2_binary + b"  "
 	assert list(json_encoder.parse_partial(data2_final)) == [data1, data2]
 	assert list(json_encoder.parse_finalize()) == []
@@ -52,8 +51,8 @@ def test_json_with_newlines(json_encoder):
 
 	data_expected = json.loads(data1 + data2)
 
-	assert list(json_encoder.parse_partial(six.b(data1))) == []
-	assert list(json_encoder.parse_partial(six.b(data2))) == [data_expected]
+	assert list(json_encoder.parse_partial(data1.encode("utf-8"))) == []
+	assert list(json_encoder.parse_partial(data2.encode("utf-8"))) == [data_expected]
 	assert list(json_encoder.parse_finalize()) == []
 
 
@@ -73,7 +72,8 @@ def test_json_parse_chained(json_encoder):
 	data1 = {'key1': 'value1'}
 	data2 = {'key2': 'value2'}
 	res = json_encoder.parse(
-		six.b(json.dumps(data1)) + six.b(json.dumps(data2)))
+		json.dumps(data1).encode("utf-8") + json.dumps(data2).encode("utf-8")
+	)
 	assert len(res) == 2
 	assert res[0]['key1'] == 'value1'
 	assert res[1]['key2'] == 'value2'
@@ -84,7 +84,8 @@ def test_json_parse_chained_newlines(json_encoder):
 	data1 = {'key1': 'value1'}
 	data2 = {'key2': 'value2'}
 	res = json_encoder.parse(
-		six.b(json.dumps(data1)) + b'\n' + six.b(json.dumps(data2)))
+		json.dumps(data1).encode("utf-8") + b'\n' + json.dumps(data2).encode("utf-8")
+	)
 	assert len(res) == 2
 	assert res[0]['key1'] == 'value1'
 	assert res[1]['key2'] == 'value2'

test/unit/test_multipart.py

@@ -14,17 +14,12 @@
 import os
 import re
 import unittest
-import urllib
+import urllib.parse
 
 import pytest
-import six
-
-from six.moves import urllib_parse
 
 import ipfshttpclient.multipart
 
-ENC = "UTF-8"
-
 class TestContentHelpers(unittest.TestCase):
 	"""Tests the functionality of the three content-oriented helper functions.
 
@@ -203,9 +198,9 @@ def do_test__gen_file(self, name, file_location, abspath):
 		file.seek(0)
 
 		expected = b'--' + generator._boundary.encode() + b'\r\n'
-		expected += b'Abspath: ' + name.encode(ENC) + b'\r\n' if abspath else b''
+		expected += b'Abspath: ' + name.encode("utf-8") + b'\r\n' if abspath else b''
 		expected += b'Content-Disposition: file; '\
-		         + b'filename="' + urllib_parse.quote_plus(name).encode(ENC) + b'"\r\n'\
+		         + b'filename="' + urllib.parse.quote_plus(name).encode("utf-8") + b'"\r\n'\
 			 + b'Content-Type: text/plain\r\n'\
 			 + b'\r\n' \
 		         + b'!234\r\n'
@@ -229,8 +224,8 @@ def do_test__gen_file_start(self, name, file_location, abspath):
 		generator = StreamFileMixinSub(name)
 
 		expected = b'--' + generator._boundary.encode() + b'\r\n'
-		expected += b'Abspath: ' + file_location.encode(ENC) + b'\r\n' if abspath else b''
-		expected += b'Content-Disposition: file; filename="' + name.encode(ENC) + b'"\r\n'\
+		expected += b'Abspath: ' + file_location.encode("utf-8") + b'\r\n' if abspath else b''
+		expected += b'Content-Disposition: file; filename="' + name.encode("utf-8") + b'"\r\n'\
 			  + b'Content-Type: application/octet-stream\r\n'\
 			  + b'\r\n'
 
@@ -314,18 +309,14 @@ def test_body_relative(self):
 		self.check_test_body(instance, abspath=False)
 
 	def check_test_body(self, instance, abspath):
-		expected = r"(--\S+\r\n"
-		expected += r"Abspath: \S+\r\n" if abspath else r""
-		expected += r"Content-Disposition: file; filename=\"\S+\"\r\n"
-		expected += r"Content-Type: application/\S+\r\n"
-		expected += r"\r\n(.|\n)*\r\n)+--\S+--\r\n"
-		actual = ""
+		expected = rb"(--\S+\r\n"
+		expected += rb"Abspath: \S+\r\n" if abspath else rb""
+		expected += rb"Content-Disposition: file; filename=\"\S+\"\r\n"
+		expected += rb"Content-Type: application/\S+\r\n"
+		expected += rb"\r\n(.|\n)*\r\n)+--\S+--\r\n"
+		actual = b""
 		for i in instance.body():
-			if type(i) is not str and type(i) is not memoryview:
-				i = i.decode()
-			elif six.PY3 and type(i) is memoryview:
-				i = i.tobytes().decode()
-			actual += i
+			actual += bytes(i)
 		assert re.search(expected, actual)
 
 

test/unit/test_utils.py

@@ -9,8 +9,6 @@
 import sys
 import unittest
 
-import six
-
 import ipfshttpclient.utils as utils
 
 class TestUtils(unittest.TestCase):
@@ -66,9 +64,7 @@ def test_clean_file_unopened_binarypath(self):
 		This test relies on the openability of the file 'fsdfgh'
 		located in 'test/functional/fake_dir'.
 		"""
-		path = os.path.dirname(__file__)
-		if isinstance(path, str):  #PY3
-			path = path.encode(sys.getfilesystemencoding())
+		path = os.fsencode(os.path.dirname(__file__))
 		path = os.path.join(path, b"..", b"functional", b"fake_dir", b"fsdfgh")
 		f, opened = utils.clean_file(path)
 		assert hasattr(f, 'read')