From: yomguy Date: Mon, 16 May 2011 19:47:33 +0000 (+0200) Subject: cleanup X-Git-Tag: 1.1~173 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9023a463ee14aadf4cc65f87c42daa2bfe8827aa;p=telemeta.git cleanup --- diff --git a/setup.py b/setup.py index 229a4d59..594bf0c8 100644 --- 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 4c3c17bb..9d3a5058 100644 --- 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 e87cad2b..d97abbe1 100644 --- 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