diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py index f95f5e1f55eda0a780517473d05ffc70b02203c2..328239715d634400b3256029846767d41b673280 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 c0e0fa0f8d8ccf391df2b9e989ce52a19b672042..f14aff18472ac1d63656ee4f85caa0e8efb5ccec 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 a0a020e609b906043ac6255dc7e7d35c2e95686a..5c6104ff3bdde5a9dfc18a9fa25a77e9b088636c 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 c231a49cb1dac1e18c42deee4a70160926608c34..d95ce78865766fc35857a11b2a2546a86dd88e60 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 77ddfbf7848b8007500b1e305d8d7834996cd8d2..b2681fadb7ba49e57ce9870aa6b8116b8b1f13c4 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 cfadb888f6c9a8d52e99a69cf5c10d33f207c9af..06983135d8d0d71526ea7b7eacf996b8977b300e 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.