summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/views_caves.py3
-rw-r--r--settings.py2
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',