cleanup

diff --git a/setup.py b/setup.py
index 229a4d591d73fc985eea45312f61ab17c8c6540b..594bf0c8a86fa965b74dc702868839b5d73a9f0f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ setup(
   url = "http://telemeta.org",
   description = "Web Audio Content Management System",
   author = ["Guillaume Pellerin, Olivier Guilyardi", "Riccardo Zaccarelli"],
-  author_email = ["yomguy@parisson.com","olivier@samalyse.com", "riccardo.zaccarrelli@gmail.com"],
+  author_email = ["yomguy@parisson.com","olivier@samalyse.com", "riccardo.zaccarelli@gmail.com"],
   version = version,
   packages = packages,
   data_files = data_files,

diff --git a/telemeta/core.py b/telemeta/core.py
index 4c3c17bb47aa19f1300ff580ede0aa6af286ecb4..9d3a5058d234a0d5e20698744115e57eed7b739e 100644 (file)
--- a/telemeta/core.py
+++ b/telemeta/core.py
@@ -19,14 +19,8 @@ __all__ = ['Component', 'ExtensionPoint', 'implements', 'Interface',
 
 class TelemetaError(Exception):
     """Exception base class for errors in Telemeta."""
-    # FIXME: is this redundant with Django's error handling ?
-
-#    def __init__(self, message, title=None, show_traceback=False):
-#        Exception.__init__(self, message)
-#        self.message = message
-#        self.title = title
-#        self.show_traceback = show_traceback
-
+    pass
+    
 class Interface(object):
     """Marker base class for extension point interfaces."""
 

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index e87cad2b587dab2738615ffedfcf62be24bfca72..d97abbe110c64d41383a4763dcbd98cf0b9b0cf3 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -61,12 +61,12 @@ from django.forms.models import modelformset_factory, inlineformset_factory
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext
 from django.contrib.auth.forms import UserChangeForm
+from django.core.exceptions import ObjectDoesNotExist
 
 from telemeta.models import *
 import telemeta.models
 import telemeta.interop.oai as oai
 from telemeta.interop.oaidatasource import TelemetaOAIDataSource
-from django.core.exceptions import ObjectDoesNotExist
 from telemeta.util.unaccent import unaccent
 from telemeta.util.unaccent import unaccent_icmp
 from telemeta.util.logger import Logger