Subliminal update

libs/subliminal/exceptions.py

@@ -1,23 +1,20 @@
 # -*- coding: utf-8 -*-
+# Copyright 2011-2012 Antoine Bertin <diaoulael@gmail.com>
 #
-# Subliminal - Subtitles, faster than your thoughts
-# Copyright (c) 2011 Antoine Bertin <diaoulael@gmail.com>
+# This file is part of subliminal.
 #
-# This file is part of Subliminal.
-#
-# Subliminal is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
+# subliminal is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# Subliminal is distributed in the hope that it will be useful,
+# subliminal is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# GNU Lesser General Public License for more details.
 #
+# You should have received a copy of the GNU Lesser General Public License
+# along with subliminal.  If not, see <http://www.gnu.org/licenses/>.
 
 
 class Error(Exception):
@@ -25,21 +22,6 @@ class Error(Exception):
     pass
 
 
-class BadStateError(Error):
-    """Exception raised when an invalid action is asked
-
-    Attributes:
-        current  -- current state of Subliminal instance
-        expected -- expected state of Subliminal instance
-    """
-    def __init__(self, current, expected):
-        self.current = current
-        self.expected = expected
-
-    def __str__(self):
-        return 'Expected state %d but current state is %d' % (self.expected, self.current)
-
-
 class InvalidLanguageError(Error):
     """Exception raised when invalid language is submitted
 
@@ -66,21 +48,21 @@ class MissingLanguageError(Error):
         return self.language
 
 
-class InvalidPluginError(Error):
-    """"Exception raised when invalid plugin is submitted
+class InvalidServiceError(Error):
+    """Exception raised when invalid service is submitted
+
+    :param string service: service that causes the error
 
-    Attributes:
-        plugin -- plugin that cause the error
     """
-    def __init__(self, plugin):
-        self.plugin = plugin
+    def __init__(self, service):
+        self.service = service
 
     def __str__(self):
-        return self.plugin
+        return self.service
 
 
-class PluginError(Error):
-    """"Exception raised by plugins"""
+class ServiceError(Error):
+    """"Exception raised by services"""
     pass
 
 
@@ -90,7 +72,7 @@ class WrongTaskError(Error):
 
 
 class DownloadFailedError(Error):
-    """"Exception raised when a download task has failed in plugin"""
+    """"Exception raised when a download task has failed in service"""
     pass