Skip to content
Snippets Groups Projects
Commit 0ce5f736 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Migration step 1: Python 3.8

parent 834f631a
Branches
No related tags found
1 merge request!8Upgrade to django 3.1
......@@ -183,7 +183,7 @@ LOGGING = {
}
try:
from local_settings import *
except ImportError:
pass
from .local_settings import *
except ImportError as ex:
print(ex)
......@@ -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'):
......
......@@ -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")
......
......@@ -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
......@@ -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)
......
......@@ -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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment