cis: bugs fixed; start / stop / remove torrents commands implemented

[living-lab-site.git] / cis / api / base.py

diff --git a/cis/api/base.py b/cis/api/base.py
index 36d490b..500aada 100644 (file)
--- a/cis/api/base.py
+++ b/cis/api/base.py
@@ -85,10 +85,10 @@ class BaseTranscoder:
         if a_codec is None and v_codec is None:
             raise ValueError('No audio or video codec specified.')
 
-        if a_codec is not None and type(a_codec) is not str:
+        if a_codec is not None and type(a_codec) not in [str, unicode]:
             raise TypeError('Audio codec must be string.')
 
-        if v_codec is not None and type(v_codec) is not str:
+        if v_codec is not None and type(v_codec) not in [str, unicode]:
             raise TypeError('Video codec must be string.')
 
         if a_samplingrate is not None and type(a_samplingrate) is not int:
@@ -137,7 +137,8 @@ class BaseTranscoder:
         """ Translates container API name into external program identifier."""
 
         if not self.containers.has_key(name) or self.containers[name] is None:
-            raise api_exceptions.NotImplementedException("Container " + name)
+            raise api_exceptions.NotImplementedException("Container " + name \
+                    + "not implemented")
 
         return self.containers[name]
 
@@ -158,7 +159,8 @@ class BaseTranscoder:
         """ Translates audio codec API name into external program identifier."""
 
         if not self.a_codecs.has_key(name) or self.a_codecs[name] is None:
-            raise api_exceptions.NotImplementedException("Audio Codec " + name)
+            raise api_exceptions.NotImplementedException("Audio Codec " + name \
+                    + "not implemented")
 
         return self.a_codecs[name]
 
@@ -166,7 +168,8 @@ class BaseTranscoder:
         """ Translates video codec API name into external program identifier."""
 
         if not self.v_codecs.has_key(name) or self.v_codecs[name] is None:
-            raise api_exceptions.NotImplementedException("Video Codec " + name)
+            raise api_exceptions.NotImplementedException("Video Codec " + name \
+                    + "not implemented")
 
         return self.v_codecs[name]