--- a/app/django/contrib/databrowse/sites.py	Tue Oct 14 12:36:55 2008 +0000
+++ b/app/django/contrib/databrowse/sites.py	Tue Oct 14 16:00:59 2008 +0000
@@ -1,6 +1,6 @@
 from django import http
 from django.db import models
-from django.contrib.databrowse.datastructures import EasyModel, EasyChoice
+from django.contrib.databrowse.datastructures import EasyModel
 from django.shortcuts import render_to_response
 from django.utils.safestring import mark_safe
 
@@ -89,7 +89,7 @@
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model in self.registry:
-                raise AlreadyRegistered('The model %s is already registered' % model.__class__.__name__)
+                raise AlreadyRegistered('The model %s is already registered' % model.__name__)
             self.registry[model] = databrowse_class
 
     def unregister(self, model_or_iterable):
@@ -102,7 +102,7 @@
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model not in self.registry:
-                raise NotRegistered('The model %s is not registered' % model.__class__.__name__)
+                raise NotRegistered('The model %s is not registered' % model.__name__)
             del self.registry[model]
 
     def root(self, request, url):