Compare commits

..

No commits in common. "b1c2dc9ce0c2c41acc5c00987dc20b846aa4d714" and "e2ebdd45ba3c676c49ca75f47beb608c733e3d2a" have entirely different histories.

6 changed files with 9 additions and 47 deletions

View file

@ -86,8 +86,7 @@ def file_upload(request):
return HttpResponse( return HttpResponse(
body=f"The file has been uploaded, but it is not a text file." body=f"The file has been uploaded, but it is not a text file."
f" Saved to {filepath}", f" Saved to {filepath}",
status_code=400, status_code=400)
)
else: else:
return TemplateResponse(request, "file_upload.html") return TemplateResponse(request, "file_upload.html")

View file

@ -208,12 +208,12 @@ class SpiderwebRouter(LocalServerMixin, MiddlewareMixin, RoutesMixin, FernetMixi
if self.media_dir: if self.media_dir:
self.media_dir = pathlib.Path(self.media_dir) self.media_dir = pathlib.Path(self.media_dir)
if not pathlib.Path(self.BASE_DIR / self.media_dir).exists(): if not pathlib.Path(self.BASE_DIR / self.media_dir).exists():
self.log.error( self.log.error(f"Media directory '{str(self.media_dir)}' does not exist.")
f"Media directory '{str(self.media_dir)}' does not exist."
)
raise ConfigError raise ConfigError
if self.debug: if self.debug:
self.add_route(rf"/{self.media_url}/<path:filename>", send_file) self.add_route(
rf"/{self.media_url}/<path:filename>", send_file
)
else: else:
self.log.warning( self.log.warning(
"`media_dir` is set, but `debug` is set to FALSE." "`media_dir` is set, but `debug` is set to FALSE."

View file

@ -9,7 +9,7 @@ from multipart import (
parse_form_data, parse_form_data,
is_form_request as m_is_form_request, is_form_request as m_is_form_request,
MultiDict, MultiDict,
MultipartPart, MultipartPart
) )
@ -58,9 +58,7 @@ class Request:
else: else:
if content_length: if content_length:
self.content = ( self.content = (
self.environ["wsgi.input"] self.environ["wsgi.input"].read(content_length).decode(DEFAULT_ENCODING)
.read(content_length)
.decode(DEFAULT_ENCODING)
) )
self.GET.update(parse_qs(self.content)) self.GET.update(parse_qs(self.content))

View file

@ -3,7 +3,6 @@ from wsgiref.util import setup_testing_defaults
from peewee import SqliteDatabase from peewee import SqliteDatabase
from spiderweb import SpiderwebRouter from spiderweb import SpiderwebRouter
from spiderweb.request import Request
class StartResponse: class StartResponse:
@ -29,34 +28,3 @@ def setup(**kwargs):
environ, environ,
StartResponse(), StartResponse(),
) )
class TestClient:
def __init__(self, **kwargs):
self.app, self.environ, self.start_response = setup(**kwargs)
...
class RequestFactory:
@staticmethod
def create_request(
environ=None,
content=None,
headers=None,
path=None,
server=None,
handler=None,
):
if not environ:
environ = {}
setup_testing_defaults(environ)
environ["HTTP_USER_AGENT"] = "Mozilla/5.0 (testrequest)"
environ["REMOTE_ADDR"] = "1.1.1.1"
return Request(
environ=environ,
content=content,
headers=headers,
path=path,
server=server,
handler=handler,
)

View file

@ -1,3 +0,0 @@
from io import BytesIO
...