diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2018-04-10 01:34:06 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2018-04-10 01:34:06 +0100 |
| commit | 242cf4741a945027fb43d3c6fb08922165c61bf0 (patch) | |
| tree | 59c0995ac0aad0d46b6cacec2f8c6c6b90a83165 | |
| parent | 41a14f161dedb01290eee423c05e1ae31589e83d (diff) | |
| download | troggle-242cf4741a945027fb43d3c6fb08922165c61bf0.tar.gz troggle-242cf4741a945027fb43d3c6fb08922165c61bf0.tar.bz2 troggle-242cf4741a945027fb43d3c6fb08922165c61bf0.zip | |
Import Image from PIL to support newer python
import the Django registration module rather than the troggle one
| -rw-r--r-- | core/views_caves.py | 3 | ||||
| -rw-r--r-- | settings.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/views_caves.py b/core/views_caves.py index 2dcef5e..e8503e2 100644 --- a/core/views_caves.py +++ b/core/views_caves.py @@ -17,7 +17,8 @@ import re, urlparse from django.shortcuts import get_object_or_404 import settings -import Image, ImageDraw, ImageFont, string, os, sys +from PIL import Image, ImageDraw, ImageFont +import string, os, sys def getCave(cave_id): """Returns a cave object when given a cave name or number. It is used by views including cavehref, ent, and qm.""" diff --git a/settings.py b/settings.py index ca3011e..670c84c 100644 --- a/settings.py +++ b/settings.py @@ -93,7 +93,7 @@ INSTALLED_APPS = ( #'troggle.photologue', #'troggle.reversion', #'django_evolution', - 'troggle.registration', + 'registration', 'troggle.profiles', 'troggle.core', 'troggle.flatpages', |