fixing migration to 2.2

mathics/doc/utils.py

@@ -5,7 +5,7 @@
 import unicodedata
 
 from django.template.defaultfilters import register, stringfilter
-from django.utils.functional import allow_lazy
+from django.utils.functional import keep_lazy as allow_lazy
 from django.utils.safestring import mark_safe
 
 

mathics/web/models.py

@@ -54,7 +54,7 @@ class Query(models.Model):
 class Worksheet(models.Model):
     user = models.ForeignKey(User, 
                              related_name='worksheets', 
-                             null=True)
+                             null=True, on_delete=models.CASCADE)
 
     name = models.CharField(max_length=30)
     content = models.TextField()

mathics/web/views.py

@@ -62,7 +62,7 @@ def main_view(request):
     return render(request, 'main.html', context)
 
 
-def error_404_view(request):
+def error_404_view(request, exception):
     t = loader.get_template('404.html')
     return HttpResponseNotFound(t.render(RequestContext(request, {
         'title': 'Page not found',

setup.py

@@ -67,7 +67,7 @@
 # General Requirements
 INSTALL_REQUIRES += [
     "sympy>=1.6, < 1.7",
-    "django >= 1.8, < 1.12",
+    "django >= 1.8",
     "mpmath>=1.1.0",
     "numpy",
     "palettable", # For bar charts, and portable, no-proprietary color palletes