diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 18:02:51 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 18:02:51 +0200 |
| commit | 4e8fd1bfb7f77a7eba1880d61a60a70481a6341f (patch) | |
| tree | b84736a8e5d329beaea0ecc5a47afb0471dc5e7b /pyload/plugin | |
| parent | Other import fixes (4) (diff) | |
| download | pyload-4e8fd1bfb7f77a7eba1880d61a60a70481a6341f.tar.xz | |
Fix dict generators for python 2.5
Diffstat (limited to 'pyload/plugin')
| -rw-r--r-- | pyload/plugin/crypter/YoutubeComFolder.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/hoster/NitroflareCom.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugin/crypter/YoutubeComFolder.py b/pyload/plugin/crypter/YoutubeComFolder.py index 6873c9148..3c971fea1 100644 --- a/pyload/plugin/crypter/YoutubeComFolder.py +++ b/pyload/plugin/crypter/YoutubeComFolder.py @@ -107,7 +107,7 @@ class YoutubeComFolder(Crypter): playlists = self.getPlaylists(channel['id']) self.logDebug("%s playlist\s found on channel \"%s\"" % (len(playlists), channel['title'])) - relatedplaylist = {p_name: self.getPlaylist(p_id) for p_name, p_id in channel['relatedPlaylists'].iteritems()} + relatedplaylist = dict((p_name, self.getPlaylist(p_id)) for p_name, p_id in channel['relatedPlaylists'].iteritems()) self.logDebug("Channel's related playlists found = %s" % relatedplaylist.keys()) relatedplaylist['uploads']['title'] = "Unplaylisted videos" diff --git a/pyload/plugin/hoster/NitroflareCom.py b/pyload/plugin/hoster/NitroflareCom.py index aed0b404f..5ebb83485 100644 --- a/pyload/plugin/hoster/NitroflareCom.py +++ b/pyload/plugin/hoster/NitroflareCom.py @@ -44,7 +44,7 @@ class NitroflareCom(SimpleHoster): elif hasattr(self, 'WAIT_PATTERN'): m = re.search(self.WAIT_PATTERN, self.html) if m: - wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in + wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1, "": 1}[u.lower()] for v, u in re.findall(r'(\d+)\s*(hr|hour|min|sec)', m.group(0), re.I)) self.wait(wait_time, wait_time > 300) return |