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

Merge branch 'upload-filetoobig' into 'master'

Browse Source 
xep_0363: pass more information to FileTooBig exception

See merge request poezio/slixmpp!50
This commit is contained in:
mathieui 2020-05-12 01:53:00 +02:00
commit 9ace053992
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,9 @@ class UploadServiceNotFound(FileUploadError):
pass pass
class FileTooBig(FileUploadError): class FileTooBig(FileUploadError):
pass def __str__(self):
return 'File size too large: {} (max: {} bytes)' \
.format(self.args[0], self.args[1])
class HTTPError(FileUploadError): class HTTPError(FileUploadError):
def __str__(self): def __str__(self):
@ -126,7 +128,7 @@ class XEP_0363(BasePlugin):
input_file.seek(0) input_file.seek(0)
if size > self.max_file_size: if size > self.max_file_size:
raise FileTooBig() raise FileTooBig(size, self.max_file_size)
if content_type is None: if content_type is None:
content_type = guess_type(filename)[0] content_type = guess_type(filename)[0]