aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/condenast.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-12-13 12:24:42 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-12-13 12:35:45 +0100
commit1cc79574fc5df21bf35dccf61eac0e9e75ed8d20 (patch)
tree5cc2bd2a2faba0ac5e8371892e3ef09ab5338080 /youtube_dl/extractor/condenast.py
parent20e35880bf7413c5085c1ade96af0fc6e56d84d1 (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/condenast.py')
-rw-r--r--youtube_dl/extractor/condenast.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/condenast.py b/youtube_dl/extractor/condenast.py
index 7a7e79360..3db4db4e4 100644
--- a/youtube_dl/extractor/condenast.py
+++ b/youtube_dl/extractor/condenast.py
@@ -5,12 +5,14 @@ import re
import json
from .common import InfoExtractor
-from ..utils import (
+from ..compat import (
compat_urllib_parse,
- orderedSet,
compat_urllib_parse_urlparse,
compat_urlparse,
)
+from ..utils import (
+ orderedSet,
+)
class CondeNastIE(InfoExtractor):