Miscellaneous cleanup from ipfs-shipyard#260 and ipfs-shipyard#262

Author: c0llab0rat0r

ipfshttpclient/client/__init__.py

@@ -18,6 +18,7 @@
 VERSION_BLACKLIST = []
 VERSION_MAXIMUM   = "0.8.0"
 
+from . import base
 from . import bitswap
 from . import block
 from . import bootstrap

ipfshttpclient/filescanner.py

@@ -20,11 +20,9 @@
 else:  #PY36-
 	re_pattern_t = re_pattern_type = type(re.compile(""))
 
-
 # Windows does not have os.O_DIRECTORY
 O_DIRECTORY: int = getattr(os, "O_DIRECTORY", 0)
 
-
 # Neither Windows nor MacOS have os.fwalk even through Python 3.9
 HAVE_FWALK: bool = hasattr(os, "fwalk")
 HAVE_FWALK_BYTES = HAVE_FWALK and sys.version_info >= (3, 7)

ipfshttpclient/http.py

@@ -20,14 +20,14 @@
 PREFER_HTTPX = (os.environ.get("PY_IPFS_HTTP_CLIENT_PREFER_HTTPX", "no").lower()
                 not in ("0", "f", "false", "n", "no"))
 if PREFER_HTTPX:  # pragma: http-backend=httpx
-	try:  #PY36+
+	try:
 		from . import http_httpx as _backend
-	except (ImportError, SyntaxError):  #PY35
+	except ImportError:
 		from . import http_requests as _backend  # type: ignore[no-redef]
 else:  # pragma: http-backend=requests
 	try:
 		from . import http_requests as _backend  # type: ignore[no-redef]
 	except ImportError:  # pragma: no cover
 		from . import http_httpx as _backend
 
-ClientSync = _backend.ClientSync
+ClientSync = _backend.ClientSync

ipfshttpclient/http_common.py

@@ -676,7 +676,7 @@ def download(
 		args
 			Positional parameters to be sent along with the HTTP request
 		opts
-			Query string paramters to be sent along with the HTTP request
+			Query string parameters to be sent along with the HTTP request
 		compress
 			Whether the downloaded file should be GZip compressed by the
 			daemon before being sent to the client
@@ -721,4 +721,4 @@ def download(
 				tf.extractall(path=utils.convert_path(target))
 		finally:
 			for closable in closables:
-				closable.close()
+				closable.close()

ipfshttpclient/multipart.py

@@ -400,6 +400,7 @@ def __init__(self, directory: ty.Union[ty.AnyStr, utils.PathLike[ty.AnyStr], int
 
 		# Figure out the absolute path of the directory added
 		self.abspath = None
+
 		if not isinstance(directory, int):
 			self.abspath = os.path.abspath(utils.convert_path(directory))
 

pyproject.toml

@@ -50,4 +50,3 @@ classifiers = [
 
 [tool.flit.metadata.urls]
 Documentation = "https://ipfs.io/ipns/12D3KooWEqnTdgqHnkkwarSrJjeMP2ZJiADWLYADaNvUb6SQNyPF/docs/"
-