From a1f7fd30812ff3b4bed44b140d18075c6be6bf63 Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 25 Mar 2019 23:36:38 +0100 Subject: [PATCH] Support Django 2.1 --- evennia/server/evennia_launcher.py | 4 ++-- evennia/web/utils/backends.py | 3 ++- requirements.txt | 2 +- win_requirements.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 4e71803ca9..774cce5094 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -91,8 +91,8 @@ SRESET = chr(19) # shutdown server in reset mode # requirements PYTHON_MIN = '3.7' TWISTED_MIN = '18.0.0' -DJANGO_MIN = '1.11' -DJANGO_REC = '2.0' +DJANGO_MIN = '2.1' +DJANGO_REC = '2.1' try: sys.path[1] = EVENNIA_ROOT diff --git a/evennia/web/utils/backends.py b/evennia/web/utils/backends.py index 3c3b5e0093..663895208a 100644 --- a/evennia/web/utils/backends.py +++ b/evennia/web/utils/backends.py @@ -10,11 +10,12 @@ class CaseInsensitiveModelBackend(ModelBackend): """ - def authenticate(self, username=None, password=None, autologin=None): + def authenticate(self, request, username=None, password=None, autologin=None): """ Custom authenticate with bypass for auto-logins Args: + request (Request): Request object. username (str, optional): Name of user to authenticate. password (str, optional): Password of user autologin (Account, optional): If given, assume this is diff --git a/requirements.txt b/requirements.txt index f9343cef3a..8883cf9c7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # Evennia dependencies, for Linux/Mac platforms # general -django >= 2.0, < 2.1 +django >= 2.1, < 2.2 twisted >= 18.0.0, < 19.0.0 pillow == 5.2.0 pytz diff --git a/win_requirements.txt b/win_requirements.txt index 310b399e08..bf9ecf8ea7 100644 --- a/win_requirements.txt +++ b/win_requirements.txt @@ -4,7 +4,7 @@ pypiwin32 # general -django > 1.11, < 2.0 +django >= 2.1, < 2.2 twisted >= 18.0.0, < 19.0.0 pillow == 5.2.0 pytz