jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it clear that filename does *not* have to be path, and is mandatory

Browse Source
This commit is contained in:
nicoco 2022-07-16 17:17:22 +02:00
parent afedfa4b06
commit ed820bf551
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slixmpp/plugins/xep_0363/http_upload.py
View File

@ -11,7 +11,7 @@ from asyncio import Future
from mimetypes import guess_type from mimetypes import guess_type
from typing import ( from typing import (
Optional, Optional,
IO, IO, Union,
) )
from pathlib import Path from pathlib import Path
@ -137,7 +137,7 @@ class XEP_0363(BasePlugin):
request['content-type'] = content_type or self.default_content_type request['content-type'] = content_type or self.default_content_type
return iq.send(**iqkwargs) return iq.send(**iqkwargs)
async def upload_file(self, filename: Path, size: Optional[int] = None, async def upload_file(self, filename: Union[Path, str], size: Optional[int] = None,
content_type: Optional[str] = None, *, content_type: Optional[str] = None, *,
input_file: Optional[IO[bytes]]=None, input_file: Optional[IO[bytes]]=None,
domain: Optional[JID] = None, domain: Optional[JID] = None,
@ -146,9 +146,10 @@ class XEP_0363(BasePlugin):
process. process.
:param filename: Path to the file to upload (or only the name if :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 size: size of the file in bytes.
:param content_type: Type of the file that will be uploaded. :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 input_file: Binary file stream on the file.
:param domain: Domain to query to find an HTTP upload service. :param domain: Domain to query to find an HTTP upload service.
:raises .UploadServiceNotFound: If slixmpp is unable to find an :raises .UploadServiceNotFound: If slixmpp is unable to find an