Browse Source

Fix PUT uploads

PUT uploads were broken on python 3.9 and were lacking tests.
fix-weird-encoding-problem-in-tests
Paweł Chojnacki 12 months ago committed by Sebastian Lohff
parent
commit
6537c054e5
  1. 6
      servefile/servefile.py
  2. 7
      tests/test_servefile.py

6
servefile/servefile.py

@ -637,7 +637,7 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler): @@ -637,7 +637,7 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler):
http://host:8080/testfile will cause the file to be named testfile. If
no filename is given, a random name will be generated.
Files can be uploaded with e.g. curl -X POST -d @file <url> .
Files can be uploaded with e.g. curl -T file <url> .
"""
length = self.getContentLength()
if length < 0:
@ -654,11 +654,11 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler): @@ -654,11 +654,11 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler):
return
# Sometimes clients want to be told to continue with their transfer
if self.headers.getheader("Expect") == "100-continue":
if self.headers.get("Expect") == "100-continue":
self.send_response(100)
self.end_headers()
target = open(cleanFileName, "w")
target = open(cleanFileName, "wb")
bytesLeft = int(self.headers['Content-Length'])
while bytesLeft > 0:
bytesToRead = min(self.blockSize, bytesLeft)

7
tests/test_servefile.py

@ -312,6 +312,13 @@ def test_upload(run_servefile, tmp_path): @@ -312,6 +312,13 @@ def test_upload(run_servefile, tmp_path):
with open(str(uploaddir / 'haiku.txt(1)')) as f:
assert f.read() == data
# upload file using PUT
r = make_request("/haiku.txt", method='put', data=data)
assert r.status_code == 201
assert 'OK!' in r.text
with open(str(uploaddir / 'haiku.txt(2)')) as f:
assert f.read() == data
def test_upload_size_limit(run_servefile, tmp_path):
uploaddir = tmp_path / 'upload'

Loading…
Cancel
Save