@@ -25,7 +25,7 @@ import urllib import cookielib from pybrightcove import config, UserAgent from pybrightcove import SortByType, SortByOrderType -from pybrightcove import BrightcoveError +from pybrightcove import BrightcoveError, NoDataFoundError from pybrightcove.multipart import MultipartPostHandler @@ -81,8 +81,10 @@ class Connection(object): url += "&%s=%s" % (key, val) req = urllib2.urlopen(url) data = simplejson.loads(req.read()) - if 'error' in data and data['error']: + if data and data.get('error', None): BrightcoveError.raise_exception(data['error']) + if data == None: + raise NoDataFoundError("No data found for %s" % repr(kwargs)) return data def post(self, command, file_to_upload=None, **kwargs): pybrightcove/connection.py @@ -25,6 +25,12 @@ class PyBrightcoveError(Exception): super(PyBrightcoveError, self).__init__(reason) +class NoDataFoundError(PyBrightcoveError): + + def __init__(self, reason=None): + super(NoDataFoundError, self).__init__(reason) + + class BrightcoveError(Exception): description = "a general error" pybrightcove/exceptions.py 125ff0462c4a97ea3a8e2807fa68bf5de863ffc4 Patrick Altman patrick@studionow.com http://github.com/studionow/pybrightcove/commit/65ccda1f039fcd6e6d4bee272bf83c25a64e0329 65ccda1f039fcd6e6d4bee272bf83c25a64e0329 2009-06-02T12:26:40-07:00 2009-06-02T12:26:40-07:00 added a NoDataFoundError and raise it if not data is found on a GET request 650c1c5fd74cef76a8c574d4024afe012bef2e19 Patrick Altman patrick@studionow.com