2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-26 01:01:53 +00:00

Import Image from PIL to support newer python

import the Django registration module rather than the troggle one
This commit is contained in:
Sam Wenham 2018-04-10 01:34:06 +01:00
parent 0c2a6b49ba
commit 0ef4f7832c
2 changed files with 3 additions and 2 deletions

View File

@ -17,7 +17,8 @@ import re, urlparse
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
import settings import settings
import Image, ImageDraw, ImageFont, string, os, sys from PIL import Image, ImageDraw, ImageFont
import string, os, sys
def getCave(cave_id): 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.""" """Returns a cave object when given a cave name or number. It is used by views including cavehref, ent, and qm."""

View File

@ -93,7 +93,7 @@ INSTALLED_APPS = (
#'troggle.photologue', #'troggle.photologue',
#'troggle.reversion', #'troggle.reversion',
#'django_evolution', #'django_evolution',
'troggle.registration', 'registration',
'troggle.profiles', 'troggle.profiles',
'troggle.core', 'troggle.core',
'troggle.flatpages', 'troggle.flatpages',