summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornicoco <nicoco@nicoco.fr>2022-07-16 20:23:48 +0200
committernicoco <nicoco@nicoco.fr>2022-07-16 20:23:48 +0200
commit14786abd348e56a2cfcbeddfe21bf6f6515c0db6 (patch)
treef5f759587756f2615e62640869f9de5b68d619ea
parented820bf55104be5cba8d42f94fa5c5ac2a165904 (diff)
downloadslixmpp-14786abd348e56a2cfcbeddfe21bf6f6515c0db6.tar.gz
slixmpp-14786abd348e56a2cfcbeddfe21bf6f6515c0db6.tar.bz2
slixmpp-14786abd348e56a2cfcbeddfe21bf6f6515c0db6.tar.xz
slixmpp-14786abd348e56a2cfcbeddfe21bf6f6515c0db6.zip
Revert "Make it clear that filename does *not* have to be path, and is mandatory"
This reverts commit ed820bf55104be5cba8d42f94fa5c5ac2a165904.
-rw-r--r--slixmpp/plugins/xep_0363/http_upload.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/slixmpp/plugins/xep_0363/http_upload.py b/slixmpp/plugins/xep_0363/http_upload.py
index 2948c4cc..c34be8ff 100644
--- a/slixmpp/plugins/xep_0363/http_upload.py
+++ b/slixmpp/plugins/xep_0363/http_upload.py
@@ -11,7 +11,7 @@ from asyncio import Future
from mimetypes import guess_type
from typing import (
Optional,
- IO, Union,
+ IO,
)
from pathlib import Path
@@ -137,7 +137,7 @@ class XEP_0363(BasePlugin):
request['content-type'] = content_type or self.default_content_type
return iq.send(**iqkwargs)
- async def upload_file(self, filename: Union[Path, str], size: Optional[int] = None,
+ async def upload_file(self, filename: Path, size: Optional[int] = None,
content_type: Optional[str] = None, *,
input_file: Optional[IO[bytes]]=None,
domain: Optional[JID] = None,
@@ -146,10 +146,9 @@ class XEP_0363(BasePlugin):
process.
:param filename: Path to the file to upload (or only the name if
- ``input_file`` is provided)
+ ``input_file`` is provided.
:param size: size of the file in bytes.
:param content_type: Type of the file that will be uploaded.
- If not provided, will be inferred from ``filename``
:param input_file: Binary file stream on the file.
:param domain: Domain to query to find an HTTP upload service.
:raises .UploadServiceNotFound: If slixmpp is unable to find an