diff options
| author | Antti Ajanki <antti.ajanki@iki.fi> | 2011-05-29 18:43:30 +0300 |
|---|---|---|
| committer | Antti Ajanki <antti.ajanki@iki.fi> | 2011-05-29 18:43:30 +0300 |
| commit | bd478ec0ef43d29f47a8892d558280cdd05a1dbb (patch) | |
| tree | 76e7afd2ad7479dd6bb8a9ae108f083441d6b09d | |
| parent | 8dff4d3ff795dfa3e71e7e43f31c95a5858a5639 (diff) | |
| download | vdr-plugin-webvideo-bd478ec0ef43d29f47a8892d558280cdd05a1dbb.tar.gz vdr-plugin-webvideo-bd478ec0ef43d29f47a8892d558280cdd05a1dbb.tar.bz2 | |
Fix some pylint warnings
| -rw-r--r-- | src/libwebvi/webvi/download.py | 14 | ||||
| -rw-r--r-- | src/libwebvi/webvi/json2xml.py | 2 | ||||
| -rw-r--r-- | src/libwebvi/webvi/request.py | 9 |
3 files changed, 15 insertions, 10 deletions
diff --git a/src/libwebvi/webvi/download.py b/src/libwebvi/webvi/download.py index ffe8323..0fbab04 100644 --- a/src/libwebvi/webvi/download.py +++ b/src/libwebvi/webvi/download.py @@ -31,7 +31,7 @@ MOZILLA_USER_AGENT = 'Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1. try: from libmimms import libmms -except ImportError, e: +except ImportError, exc: pass # Mapping from curl error codes to webvi errors. The error constants @@ -61,6 +61,7 @@ else: class DownloaderException(Exception): def __init__(self, errcode, errmsg): + Exception.__init__(self) self.code = errcode self.msg = errmsg @@ -328,8 +329,8 @@ class MMSDownload(DownloaderBase, asyncore.file_dispatcher): def start(self): try: self.stream = libmms.Stream(self.url, 1000000) - except libmms.Error, e: - self.errmsg = e.message + except libmms.Error, exc: + self.errmsg = exc.message self.handle_close() return @@ -362,8 +363,8 @@ class MMSDownload(DownloaderBase, asyncore.file_dispatcher): data = self.recv(4096) if data and (self.writefunc is not None): self.writefunc(data) - except libmms.Error, e: - self.errmsg = e.message + except libmms.Error, exc: + self.errmsg = exc.message self.handle_close() return @@ -390,6 +391,9 @@ class ExternalDownloader(DownloaderBase, asyncore.file_dispatcher): def __init__(self, executable, parameters, writefunc=None, headerfunc=None, donefunc=None, headers_only=False): DownloaderBase.__init__(self, '') + # Call the direct base class file_dispatcher.__init__() later + # in start() because we don't have the file descriptor yet. + # TODO: rework this asyncore.dispatcher.__init__(self, None, None) self.executable = executable self.writefunc = writefunc diff --git a/src/libwebvi/webvi/json2xml.py b/src/libwebvi/webvi/json2xml.py index 372e6c6..d7c4acd 100644 --- a/src/libwebvi/webvi/json2xml.py +++ b/src/libwebvi/webvi/json2xml.py @@ -8,7 +8,7 @@ except ImportError: import simplejson as json except ImportError: print 'Error: install simplejson' - raise + raise def _serialize_to_xml(obj, xmlnode): """Create XML representation of a Python object (list, tuple, diff --git a/src/libwebvi/webvi/request.py b/src/libwebvi/webvi/request.py index c110847..87dcf87 100644 --- a/src/libwebvi/webvi/request.py +++ b/src/libwebvi/webvi/request.py @@ -37,7 +37,7 @@ def debug(msg): sys.stderr.write(msg.encode('ascii', 'replace')) else: sys.stderr.write(msg) - sys.stderr.write('\n') + sys.stderr.write('\n') def set_template_path(path): global template_path @@ -193,6 +193,7 @@ class Request: self.status = -1 self.errmsg = None self.mediaurls = [] + self.checking_url = None # stream information self.contenttype = 'text/xml' @@ -333,7 +334,7 @@ class Request: try: doc = libxml2.parseFile(filename) except libxml2.parserError: - debug("Failed to parse " + filename); + debug("Failed to parse " + filename) continue title = '' @@ -341,7 +342,7 @@ class Request: root = doc.getRootElement() if (root is None) or (root.name != 'service'): - debug("Root node is not 'service' in " + filename); + debug("Root node is not 'service' in " + filename) doc.freeDoc() continue node = root.children @@ -354,7 +355,7 @@ class Request: doc.freeDoc() if (title == '') or (url == ''): - debug("Empty <title> or <ref> in " + filename); + debug("Empty <title> or <ref> in " + filename) continue menuitems[title.lower()] = ('<link>\n' |