From 0ce5f736dcbe2cdafc06d84f014c34367a4a7b12 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 23 Nov 2020 11:22:53 +0100
Subject: [PATCH] Migration step 1: Python 3.8
---
VIPSWeb/settings.py | 6 +++---
common/middleware/whodid.py | 2 +-
forecasts/templatetags/forecast_extras.py | 2 +-
requirements.txt | 6 +++---
security/middleware/check_login_middleware.py | 2 +-
security/views.py | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py
index f95f5e1f..32823971 100755
--- a/VIPSWeb/settings.py
+++ b/VIPSWeb/settings.py
@@ -183,7 +183,7 @@ LOGGING = {
}
try:
- from local_settings import *
-except ImportError:
- pass
+ from .local_settings import *
+except ImportError as ex:
+ print(ex)
diff --git a/common/middleware/whodid.py b/common/middleware/whodid.py
index c0e0fa0f..f14aff18 100755
--- a/common/middleware/whodid.py
+++ b/common/middleware/whodid.py
@@ -40,7 +40,7 @@ class WhodidMiddleware(object):
return response
def mark_whodid(self, user, sender, instance, **kwargs):
- print instance
+ print (instance)
if not getattr(instance, 'created_by_id', None):
instance.created_by = user
if hasattr(instance,'modified_by_id'):
diff --git a/forecasts/templatetags/forecast_extras.py b/forecasts/templatetags/forecast_extras.py
index a0a020e6..5c6104ff 100755
--- a/forecasts/templatetags/forecast_extras.py
+++ b/forecasts/templatetags/forecast_extras.py
@@ -34,7 +34,7 @@ def addfloat(value, arg):
try:
return float(value) + float(arg)
except ValueError:
- print value
+ print (value)
return float(arg)
@register.filter(name="distanceto")
diff --git a/requirements.txt b/requirements.txt
index c231a49c..d95ce788 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,10 +18,10 @@
# Please add requirements here
# Read docs for how this works: http://www.pip-installer.org/en/latest/cookbook.html
-Django==1.11
+Django==1.11.17
Pillow
requests==2.6.0
django-tinymce==2.8.0
-python-dateutil==1.5
+python-dateutil==2.8.1
django-extensions
-selenium
\ No newline at end of file
+selenium
diff --git a/security/middleware/check_login_middleware.py b/security/middleware/check_login_middleware.py
index 77ddfbf7..b2681fad 100755
--- a/security/middleware/check_login_middleware.py
+++ b/security/middleware/check_login_middleware.py
@@ -58,7 +58,7 @@ class CheckLoginMiddleware(object):
if user_uuid != None:
found_user = VipsLogicUser.find_by_uuid(user_uuid)
if found_user != None:
- print "Found user. Logging in."
+ #print ("Found user. Logging in.")
request.session["vips_logic_user"] = found_user
request.session["user_uuid"] = user_uuid
request.session["last_modified"] = datetime.now().strftime(CheckLoginMiddleware.datetime_format)
diff --git a/security/views.py b/security/views.py
index cfadb888..06983135 100755
--- a/security/views.py
+++ b/security/views.py
@@ -20,7 +20,7 @@
from django.http import JsonResponse, HttpResponseRedirect
from django.shortcuts import render
from django.conf import settings
-from models import VipsLogicUser
+from security.models import VipsLogicUser
import requests
# Create your views here.
--
GitLab