diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-12-13 12:24:42 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-12-13 12:35:45 +0100 |
| commit | 1cc79574fc5df21bf35dccf61eac0e9e75ed8d20 (patch) | |
| tree | 5cc2bd2a2faba0ac5e8371892e3ef09ab5338080 /youtube_dl/extractor/dailymotion.py | |
| parent | 20e35880bf7413c5085c1ade96af0fc6e56d84d1 (diff) | |
Fix imports and general cleanup
· Import from compat what comes from compat. Yes, some names are available in utils too, but that's an implementation detail.
· Use _match_id consistently whenever possible
· Fix some outdated tests
· Use consistent valid URL (always match the whole protocol, no ^ at start required)
· Use modern test definitions
Diffstat (limited to 'youtube_dl/extractor/dailymotion.py')
| -rw-r--r-- | youtube_dl/extractor/dailymotion.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index 936c13cd6..cf5841a7c 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -8,13 +8,15 @@ import itertools from .common import InfoExtractor from .subtitles import SubtitlesInfoExtractor -from ..utils import ( - compat_urllib_request, +from ..compat import ( compat_str, + compat_urllib_request, +) +from ..utils import ( + ExtractorError, + int_or_none, orderedSet, str_to_int, - int_or_none, - ExtractorError, unescapeHTML, ) |