summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-03-22 15:17:32 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-03-22 15:17:32 +0100
commit56dd55721c9fd818f1cfece305eda7910de39430 (patch)
tree5c6d1dc42fb5b8d8732dc33a7f812d4e82f629d8
parent231f76b530d214e64762c8129861c0eff7d9494f (diff)
downloadyoutube-dl-56dd55721c9fd818f1cfece305eda7910de39430.tar.gz
youtube-dl-56dd55721c9fd818f1cfece305eda7910de39430.tar.xz
youtube-dl-56dd55721c9fd818f1cfece305eda7910de39430.zip
Remove unused imports and clarify variable names
-rw-r--r--youtube_dl/extractor/parliamentliveuk.py4
-rw-r--r--youtube_dl/extractor/toypics.py5
-rw-r--r--youtube_dl/extractor/xtube.py4
3 files changed, 4 insertions, 9 deletions
diff --git a/youtube_dl/extractor/parliamentliveuk.py b/youtube_dl/extractor/parliamentliveuk.py
index 02dca14c0..0a423a08f 100644
--- a/youtube_dl/extractor/parliamentliveuk.py
+++ b/youtube_dl/extractor/parliamentliveuk.py
@@ -3,10 +3,6 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    unified_strdate,
-)
 
 
 class ParliamentLiveUKIE(InfoExtractor):
diff --git a/youtube_dl/extractor/toypics.py b/youtube_dl/extractor/toypics.py
index 33a6988ca..34008afc6 100644
--- a/youtube_dl/extractor/toypics.py
+++ b/youtube_dl/extractor/toypics.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from math import ceil
 import re
 
 
@@ -70,7 +69,7 @@ class ToypicsUserIE(InfoExtractor):
             'id': username,
             'entries': [{
                 '_type': 'url',
-                'url': url,
+                'url': eurl,
                 'ie_key': 'Toypics',
-            } for url in urls]
+            } for eurl in urls]
         }
diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py
index cdc0059f6..033a9d893 100644
--- a/youtube_dl/extractor/xtube.py
+++ b/youtube_dl/extractor/xtube.py
@@ -58,10 +58,10 @@ class XTubeIE(InfoExtractor):
         QUALITIES = ['3gp', 'mp4_normal', 'mp4_high', 'flv', 'mp4_ultra', 'mp4_720', 'mp4_1080']
         formats = [
             {
-                'url': url,
+                'url': furl,
                 'format_id': format_id,
                 'preference': QUALITIES.index(format_id) if format_id in QUALITIES else -1,
-            } for format_id, url in player_quality_option.items()
+            } for format_id, furl in player_quality_option.items()
         ]
         self._sort_formats(formats)