From 482ca2b563ede2a9e43abd22a97e339391e72289 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Sat, 12 Nov 2022 00:53:06 +0530 Subject: [PATCH] Run `isort` * In `extractors/extractor.py`, youtube extractors are moved to top --- devscripts/bash-completion.py | 2 +- devscripts/buildserver.py | 4 +- devscripts/check-porn.py | 4 +- devscripts/create-github-release.py | 5 +- devscripts/fish-completion.py | 2 +- devscripts/generate_aes_testdata.py | 6 +- devscripts/gh-pages/add-version.py | 5 +- devscripts/gh-pages/sign-versions.py | 3 +- devscripts/gh-pages/update-copyright.py | 2 +- devscripts/gh-pages/update-feed.py | 1 - devscripts/gh-pages/update-sites.py | 2 +- devscripts/make_lazy_extractors.py | 6 +- devscripts/make_readme.py | 2 +- devscripts/make_supportedsites.py | 1 - devscripts/show-downloads-statistics.py | 5 +- devscripts/zsh-completion.py | 2 +- docs/conf.py | 4 +- setup.py | 6 +- test/helper.py | 14 +- test/test_InfoExtractor.py | 14 +- test/test_YoutubeDL.py | 1 + test/test_YoutubeDLCookieJar.py | 1 + test/test_aes.py | 13 +- test/test_age_restriction.py | 3 +- test/test_all_urls.py | 11 +- test/test_cache.py | 1 + test/test_compat.py | 5 +- test/test_download.py | 27 +- test/test_downloader_http.py | 4 +- test/test_execution.py | 6 +- test/test_http.py | 6 +- test/test_iqiyi_sdk_interpreter.py | 1 + test/test_jsinterp.py | 2 +- test/test_netrc.py | 5 +- test/test_options.py | 1 + test/test_postprocessors.py | 1 + test/test_socks.py | 11 +- test/test_subtitles.py | 29 +- test/test_swfinterp.py | 2 +- test/test_unicode_literals.py | 1 + test/test_update.py | 2 + test/test_utils.py | 83 +- test/test_verbose_output.py | 6 +- test/test_write_annotations.py | 8 +- test/test_youtube_lists.py | 8 +- test/test_youtube_misc.py | 1 + test/test_youtube_signature.py | 4 +- youtube_dl/YoutubeDL.py | 117 +- youtube_dl/__init__.py | 25 +- youtube_dl/__main__.py | 3 +- youtube_dl/casefold.py | 5 +- youtube_dl/compat.py | 4 +- youtube_dl/downloader/__init__.py | 13 +- youtube_dl/downloader/common.py | 2 +- youtube_dl/downloader/dash.py | 5 +- youtube_dl/downloader/external.py | 15 +- youtube_dl/downloader/f4m.py | 11 +- youtube_dl/downloader/fragment.py | 4 +- youtube_dl/downloader/hls.py | 17 +- youtube_dl/downloader/http.py | 13 +- youtube_dl/downloader/ism.py | 8 +- youtube_dl/downloader/rtmp.py | 2 +- youtube_dl/downloader/rtsp.py | 5 +- youtube_dl/extractor/abc.py | 2 +- youtube_dl/extractor/abcnews.py | 6 +- youtube_dl/extractor/abcotvs.py | 6 +- youtube_dl/extractor/acast.py | 7 +- youtube_dl/extractor/adn.py | 8 +- youtube_dl/extractor/adobeconnect.py | 5 +- youtube_dl/extractor/adobepass.py | 14 +- youtube_dl/extractor/adobetv.py | 4 +- youtube_dl/extractor/afreecatv.py | 2 +- youtube_dl/extractor/airmozilla.py | 6 +- youtube_dl/extractor/aliexpress.py | 5 +- youtube_dl/extractor/alphaporno.py | 7 +- youtube_dl/extractor/amara.py | 8 +- youtube_dl/extractor/amcnetworks.py | 7 +- youtube_dl/extractor/amp.py | 2 +- youtube_dl/extractor/animeondemand.py | 2 +- youtube_dl/extractor/anvato.py | 2 +- youtube_dl/extractor/aol.py | 11 +- youtube_dl/extractor/apa.py | 6 +- youtube_dl/extractor/appleconnect.py | 5 +- youtube_dl/extractor/appletrailers.py | 8 +- youtube_dl/extractor/arcpublishing.py | 7 +- youtube_dl/extractor/ard.py | 4 +- youtube_dl/extractor/arnes.py | 12 +- youtube_dl/extractor/arte.py | 5 +- youtube_dl/extractor/asiancrush.py | 2 +- youtube_dl/extractor/atresplayer.py | 6 +- youtube_dl/extractor/atvat.py | 6 +- youtube_dl/extractor/audimedia.py | 5 +- youtube_dl/extractor/audioboom.py | 5 +- youtube_dl/extractor/audiomack.py | 5 +- youtube_dl/extractor/awaan.py | 7 +- youtube_dl/extractor/bandcamp.py | 4 +- youtube_dl/extractor/beeg.py | 10 +- youtube_dl/extractor/bigflix.py | 5 +- youtube_dl/extractor/bild.py | 5 +- youtube_dl/extractor/bilibili.py | 7 +- youtube_dl/extractor/biobiochiletv.py | 5 +- youtube_dl/extractor/biqle.py | 5 +- youtube_dl/extractor/bitchute.py | 6 +- youtube_dl/extractor/bleacherreport.py | 8 +- youtube_dl/extractor/bongacams.py | 6 +- youtube_dl/extractor/bostonglobe.py | 5 +- youtube_dl/extractor/box.py | 7 +- youtube_dl/extractor/bpb.py | 5 +- youtube_dl/extractor/br.py | 2 +- youtube_dl/extractor/bravotv.py | 6 +- youtube_dl/extractor/breakcom.py | 5 +- youtube_dl/extractor/brightcove.py | 4 +- youtube_dl/extractor/byutv.py | 7 +- youtube_dl/extractor/camdemy.py | 12 +- youtube_dl/extractor/cammodels.py | 6 +- youtube_dl/extractor/camtube.py | 5 +- youtube_dl/extractor/camwithher.py | 6 +- youtube_dl/extractor/canalplus.py | 4 +- youtube_dl/extractor/canvas.py | 2 +- youtube_dl/extractor/carambatv.py | 9 +- youtube_dl/extractor/cbc.py | 23 +- youtube_dl/extractor/cbs.py | 4 +- youtube_dl/extractor/cbslocal.py | 5 +- youtube_dl/extractor/cbsnews.py | 11 +- youtube_dl/extractor/cbssports.py | 5 +- youtube_dl/extractor/ccc.py | 7 +- youtube_dl/extractor/cctv.py | 6 +- youtube_dl/extractor/cda.py | 6 +- youtube_dl/extractor/ceskatelevize.py | 7 +- youtube_dl/extractor/channel9.py | 2 +- youtube_dl/extractor/chaturbate.py | 6 +- youtube_dl/extractor/chilloutzone.py | 7 +- youtube_dl/extractor/cinchcast.py | 5 +- youtube_dl/extractor/ciscolive.py | 5 +- youtube_dl/extractor/cjsw.py | 5 +- youtube_dl/extractor/cliphunter.py | 5 +- youtube_dl/extractor/clippit.py | 9 +- youtube_dl/extractor/clipsyndicate.py | 5 +- youtube_dl/extractor/cloudy.py | 5 +- youtube_dl/extractor/clubic.py | 5 +- youtube_dl/extractor/clyp.py | 10 +- youtube_dl/extractor/common.py | 23 +- youtube_dl/extractor/commonprotocols.py | 4 +- youtube_dl/extractor/condenast.py | 5 +- youtube_dl/extractor/contv.py | 5 +- youtube_dl/extractor/corus.py | 7 +- youtube_dl/extractor/cracked.py | 5 +- youtube_dl/extractor/crackle.py | 4 +- youtube_dl/extractor/crooksandliars.py | 5 +- youtube_dl/extractor/crunchyroll.py | 12 +- youtube_dl/extractor/cspan.py | 6 +- youtube_dl/extractor/ctsnews.py | 2 +- youtube_dl/extractor/cultureunplugged.py | 5 +- youtube_dl/extractor/curiositystream.py | 7 +- youtube_dl/extractor/dailymail.py | 7 +- youtube_dl/extractor/dailymotion.py | 4 +- youtube_dl/extractor/dctp.py | 7 +- youtube_dl/extractor/deezer.py | 6 +- youtube_dl/extractor/democracynow.py | 7 +- youtube_dl/extractor/discovery.py | 3 +- youtube_dl/extractor/discoverygo.py | 2 +- youtube_dl/extractor/disney.py | 6 +- youtube_dl/extractor/dotsub.py | 5 +- youtube_dl/extractor/douyutv.py | 9 +- youtube_dl/extractor/dplay.py | 2 +- youtube_dl/extractor/drbonanza.py | 6 +- youtube_dl/extractor/drtuber.py | 7 +- youtube_dl/extractor/drtv.py | 5 +- youtube_dl/extractor/dtube.py | 5 +- youtube_dl/extractor/dumpert.py | 5 +- youtube_dl/extractor/dvtv.py | 4 +- youtube_dl/extractor/dw.py | 5 +- youtube_dl/extractor/eagleplatform.py | 7 +- youtube_dl/extractor/eighttracks.py | 8 +- youtube_dl/extractor/einthusan.py | 8 +- youtube_dl/extractor/eitb.py | 7 +- youtube_dl/extractor/eporner.py | 2 +- youtube_dl/extractor/eroprofile.py | 5 +- youtube_dl/extractor/escapist.py | 7 +- youtube_dl/extractor/espn.py | 6 +- youtube_dl/extractor/esri.py | 6 +- youtube_dl/extractor/europa.py | 2 +- youtube_dl/extractor/expotv.py | 5 +- youtube_dl/extractor/expressen.py | 7 +- youtube_dl/extractor/extractors.py | 1215 +++++------------ youtube_dl/extractor/extremetube.py | 2 +- youtube_dl/extractor/eyedotv.py | 6 +- youtube_dl/extractor/facebook.py | 2 +- youtube_dl/extractor/faz.py | 6 +- youtube_dl/extractor/fc2.py | 12 +- youtube_dl/extractor/fczenit.py | 5 +- youtube_dl/extractor/filmon.py | 12 +- youtube_dl/extractor/firsttv.py | 12 +- youtube_dl/extractor/flickr.py | 11 +- youtube_dl/extractor/folketinget.py | 7 +- youtube_dl/extractor/fox.py | 6 +- youtube_dl/extractor/foxgay.py | 6 +- youtube_dl/extractor/franceculture.py | 6 +- youtube_dl/extractor/francetv.py | 9 +- youtube_dl/extractor/freshlive.py | 7 +- youtube_dl/extractor/frontendmasters.py | 5 +- youtube_dl/extractor/funimation.py | 4 +- youtube_dl/extractor/funk.py | 5 +- youtube_dl/extractor/fusion.py | 7 +- youtube_dl/extractor/gaia.py | 5 +- youtube_dl/extractor/gameinformer.py | 6 +- youtube_dl/extractor/gamestar.py | 5 +- youtube_dl/extractor/gaskrank.py | 7 +- youtube_dl/extractor/gedidigital.py | 5 +- youtube_dl/extractor/generic.py | 183 ++- youtube_dl/extractor/gfycat.py | 7 +- youtube_dl/extractor/giantbomb.py | 9 +- youtube_dl/extractor/giga.py | 2 +- youtube_dl/extractor/gigya.py | 6 +- youtube_dl/extractor/globo.py | 5 +- youtube_dl/extractor/go.py | 4 +- youtube_dl/extractor/godtube.py | 5 +- youtube_dl/extractor/golem.py | 9 +- youtube_dl/extractor/googledrive.py | 2 +- youtube_dl/extractor/googlepodcasts.py | 7 +- youtube_dl/extractor/goshgay.py | 8 +- youtube_dl/extractor/hbo.py | 4 +- youtube_dl/extractor/hearthisat.py | 2 +- youtube_dl/extractor/heise.py | 2 +- youtube_dl/extractor/hellporno.py | 7 +- youtube_dl/extractor/hidive.py | 7 +- youtube_dl/extractor/hitbox.py | 6 +- youtube_dl/extractor/hitrecord.py | 7 +- youtube_dl/extractor/hketv.py | 2 +- youtube_dl/extractor/hornbunny.py | 5 +- youtube_dl/extractor/hotstar.py | 7 +- youtube_dl/extractor/howstuffworks.py | 2 +- youtube_dl/extractor/hrfernsehen.py | 6 +- youtube_dl/extractor/hrti.py | 2 +- youtube_dl/extractor/huajiao.py | 5 +- youtube_dl/extractor/huffpost.py | 6 +- youtube_dl/extractor/hungama.py | 5 +- youtube_dl/extractor/ign.py | 5 +- youtube_dl/extractor/iheart.py | 7 +- youtube_dl/extractor/imggaming.py | 7 +- youtube_dl/extractor/imgur.py | 7 +- youtube_dl/extractor/infoq.py | 10 +- youtube_dl/extractor/instagram.py | 7 +- youtube_dl/extractor/internetvideoarchive.py | 5 +- youtube_dl/extractor/iprima.py | 5 +- youtube_dl/extractor/iqiyi.py | 9 +- youtube_dl/extractor/itv.py | 4 +- youtube_dl/extractor/ivi.py | 6 +- youtube_dl/extractor/ivideon.py | 5 +- youtube_dl/extractor/iwara.py | 7 +- youtube_dl/extractor/izlesene.py | 5 +- youtube_dl/extractor/jamendo.py | 8 +- youtube_dl/extractor/joj.py | 6 +- youtube_dl/extractor/jove.py | 5 +- youtube_dl/extractor/kaltura.py | 11 +- youtube_dl/extractor/kankan.py | 2 +- youtube_dl/extractor/karrierevideos.py | 7 +- youtube_dl/extractor/keezmovies.py | 2 +- youtube_dl/extractor/ketnet.py | 5 +- youtube_dl/extractor/khanacademy.py | 6 +- youtube_dl/extractor/kinja.py | 5 +- youtube_dl/extractor/kinopoisk.py | 5 +- youtube_dl/extractor/konserthusetplay.py | 7 +- youtube_dl/extractor/krasview.py | 5 +- youtube_dl/extractor/kusi.py | 2 +- youtube_dl/extractor/kuwo.py | 4 +- youtube_dl/extractor/la7.py | 5 +- youtube_dl/extractor/laola1tv.py | 4 +- youtube_dl/extractor/lbry.py | 4 +- youtube_dl/extractor/lcp.py | 2 +- youtube_dl/extractor/lecture2go.py | 2 +- youtube_dl/extractor/lecturio.py | 2 +- youtube_dl/extractor/leeco.py | 2 +- youtube_dl/extractor/lego.py | 6 +- youtube_dl/extractor/libraryofcongress.py | 8 +- youtube_dl/extractor/lifenews.py | 7 +- youtube_dl/extractor/limelight.py | 2 +- youtube_dl/extractor/line.py | 7 +- youtube_dl/extractor/linuxacademy.py | 8 +- youtube_dl/extractor/litv.py | 7 +- youtube_dl/extractor/livestream.py | 25 +- youtube_dl/extractor/lnkgo.py | 7 +- youtube_dl/extractor/lrt.py | 5 +- youtube_dl/extractor/lynda.py | 11 +- youtube_dl/extractor/mailru.py | 7 +- youtube_dl/extractor/mangomolo.py | 5 +- youtube_dl/extractor/markiza.py | 6 +- youtube_dl/extractor/mdr.py | 5 +- youtube_dl/extractor/medialaan.py | 7 +- youtube_dl/extractor/mediaset.py | 11 +- youtube_dl/extractor/mediasite.py | 8 +- youtube_dl/extractor/medici.py | 6 +- youtube_dl/extractor/meipai.py | 6 +- youtube_dl/extractor/melonvod.py | 5 +- youtube_dl/extractor/meta.py | 6 +- youtube_dl/extractor/metacafe.py | 4 +- youtube_dl/extractor/metacritic.py | 4 +- youtube_dl/extractor/mgoon.py | 6 +- youtube_dl/extractor/mgtv.py | 10 +- .../extractor/microsoftvirtualacademy.py | 4 +- youtube_dl/extractor/minds.py | 7 +- youtube_dl/extractor/ministrygrid.py | 5 +- youtube_dl/extractor/minoto.py | 5 +- youtube_dl/extractor/miomio.py | 7 +- youtube_dl/extractor/mit.py | 8 +- youtube_dl/extractor/mitele.py | 5 +- youtube_dl/extractor/mixcloud.py | 9 +- youtube_dl/extractor/mnet.py | 6 +- youtube_dl/extractor/moevideo.py | 5 +- youtube_dl/extractor/mofosex.py | 6 +- youtube_dl/extractor/mojvideo.py | 5 +- youtube_dl/extractor/motorsport.py | 4 +- youtube_dl/extractor/movieclips.py | 7 +- youtube_dl/extractor/movingimage.py | 5 +- youtube_dl/extractor/msn.py | 7 +- youtube_dl/extractor/mtv.py | 9 +- youtube_dl/extractor/muenchentv.py | 6 +- youtube_dl/extractor/mwave.py | 5 +- youtube_dl/extractor/myspace.py | 6 +- youtube_dl/extractor/myspass.py | 6 +- youtube_dl/extractor/nationalgeographic.py | 5 +- youtube_dl/extractor/naver.py | 2 +- youtube_dl/extractor/nba.py | 2 +- youtube_dl/extractor/nbc.py | 2 +- youtube_dl/extractor/ndr.py | 2 +- youtube_dl/extractor/ndtv.py | 11 +- youtube_dl/extractor/neteasemusic.py | 10 +- youtube_dl/extractor/netzkino.py | 7 +- youtube_dl/extractor/nfl.py | 6 +- youtube_dl/extractor/nhl.py | 7 +- youtube_dl/extractor/niconico.py | 10 +- youtube_dl/extractor/ninenow.py | 7 +- youtube_dl/extractor/njpwworld.py | 5 +- youtube_dl/extractor/nobelprize.py | 6 +- youtube_dl/extractor/noovo.py | 7 +- youtube_dl/extractor/normalboots.py | 5 +- youtube_dl/extractor/nowness.py | 10 +- youtube_dl/extractor/noz.py | 12 +- youtube_dl/extractor/npo.py | 7 +- youtube_dl/extractor/npr.py | 6 +- youtube_dl/extractor/nrk.py | 4 +- youtube_dl/extractor/ntvcojp.py | 5 +- youtube_dl/extractor/ntvde.py | 6 +- youtube_dl/extractor/ntvru.py | 7 +- youtube_dl/extractor/nuevo.py | 6 +- youtube_dl/extractor/nuvid.py | 11 +- youtube_dl/extractor/nytimes.py | 4 +- youtube_dl/extractor/nzz.py | 4 +- youtube_dl/extractor/odatv.py | 6 +- youtube_dl/extractor/odnoklassniki.py | 2 +- youtube_dl/extractor/ondemandkorea.py | 5 +- youtube_dl/extractor/onet.py | 4 +- youtube_dl/extractor/ooyala.py | 7 +- youtube_dl/extractor/openload.py | 7 +- youtube_dl/extractor/ora.py | 7 +- youtube_dl/extractor/orf.py | 2 +- youtube_dl/extractor/packtpub.py | 11 +- youtube_dl/extractor/palcomp3.py | 6 +- youtube_dl/extractor/pandoratv.py | 5 +- youtube_dl/extractor/patreon.py | 2 +- youtube_dl/extractor/pbs.py | 4 +- youtube_dl/extractor/pearvideo.py | 5 +- youtube_dl/extractor/periscope.py | 6 +- youtube_dl/extractor/philharmoniedeparis.py | 5 +- youtube_dl/extractor/picarto.py | 5 +- youtube_dl/extractor/piksel.py | 2 +- youtube_dl/extractor/pladform.py | 4 +- youtube_dl/extractor/platzi.py | 7 +- youtube_dl/extractor/playfm.py | 6 +- youtube_dl/extractor/playplustv.py | 7 +- youtube_dl/extractor/playstuff.py | 5 +- youtube_dl/extractor/playtvak.py | 12 +- youtube_dl/extractor/playvid.py | 5 +- youtube_dl/extractor/playwire.py | 5 +- youtube_dl/extractor/pluralsight.py | 7 +- youtube_dl/extractor/pokemon.py | 5 +- youtube_dl/extractor/polskieradio.py | 6 +- youtube_dl/extractor/popcorntimes.py | 5 +- youtube_dl/extractor/popcorntv.py | 6 +- youtube_dl/extractor/porn91.py | 6 +- youtube_dl/extractor/porncom.py | 7 +- youtube_dl/extractor/pornhd.py | 2 +- youtube_dl/extractor/pornhub.py | 12 +- youtube_dl/extractor/pornovoisines.py | 6 +- youtube_dl/extractor/pornoxo.py | 4 +- youtube_dl/extractor/prosiebensat1.py | 2 +- youtube_dl/extractor/puhutv.py | 7 +- youtube_dl/extractor/puls4.py | 6 +- youtube_dl/extractor/qqmusic.py | 7 +- youtube_dl/extractor/radiocanada.py | 7 +- youtube_dl/extractor/rai.py | 11 +- youtube_dl/extractor/rbmaradio.py | 7 +- youtube_dl/extractor/rds.py | 6 +- youtube_dl/extractor/redbulltv.py | 5 +- youtube_dl/extractor/reddit.py | 2 +- youtube_dl/extractor/redtube.py | 2 +- youtube_dl/extractor/regiotv.py | 7 +- youtube_dl/extractor/rentv.py | 6 +- youtube_dl/extractor/reuters.py | 6 +- youtube_dl/extractor/reverbnation.py | 5 +- youtube_dl/extractor/rice.py | 6 +- youtube_dl/extractor/rmcdecouverte.py | 7 +- youtube_dl/extractor/rockstargames.py | 5 +- youtube_dl/extractor/roosterteeth.py | 12 +- youtube_dl/extractor/roxwel.py | 2 +- youtube_dl/extractor/rozhlas.py | 5 +- youtube_dl/extractor/rtbf.py | 7 +- youtube_dl/extractor/rte.py | 2 +- youtube_dl/extractor/rtl2.py | 10 +- youtube_dl/extractor/rtlnl.py | 5 +- youtube_dl/extractor/rtp.py | 5 +- youtube_dl/extractor/rtve.py | 7 +- youtube_dl/extractor/rumble.py | 7 +- youtube_dl/extractor/rutube.py | 10 +- youtube_dl/extractor/rutv.py | 6 +- youtube_dl/extractor/ruutu.py | 2 +- youtube_dl/extractor/ruv.py | 5 +- youtube_dl/extractor/safari.py | 11 +- youtube_dl/extractor/samplefocus.py | 6 +- youtube_dl/extractor/sapo.py | 5 +- youtube_dl/extractor/sbs.py | 5 +- youtube_dl/extractor/screencast.py | 9 +- youtube_dl/extractor/scrippsnetworks.py | 10 +- youtube_dl/extractor/scte.py | 6 +- youtube_dl/extractor/seeker.py | 5 +- youtube_dl/extractor/senateisvp.py | 11 +- youtube_dl/extractor/sendtonews.py | 8 +- youtube_dl/extractor/servus.py | 2 +- youtube_dl/extractor/sevenplus.py | 11 +- youtube_dl/extractor/seznamzpravy.py | 13 +- youtube_dl/extractor/shahid.py | 2 +- youtube_dl/extractor/shared.py | 9 +- youtube_dl/extractor/showroomlive.py | 6 +- youtube_dl/extractor/sina.py | 10 +- youtube_dl/extractor/sixplay.py | 13 +- youtube_dl/extractor/sky.py | 7 +- youtube_dl/extractor/skyit.py | 13 +- youtube_dl/extractor/skynewsarabia.py | 5 +- youtube_dl/extractor/slideshare.py | 11 +- youtube_dl/extractor/slideslive.py | 7 +- youtube_dl/extractor/snotr.py | 6 +- youtube_dl/extractor/sohu.py | 11 +- youtube_dl/extractor/sonyliv.py | 5 +- youtube_dl/extractor/soundcloud.py | 15 +- youtube_dl/extractor/spankbang.py | 2 +- youtube_dl/extractor/sportbox.py | 7 +- youtube_dl/extractor/sportdeutschland.py | 5 +- youtube_dl/extractor/springboardplatform.py | 6 +- youtube_dl/extractor/sprout.py | 6 +- youtube_dl/extractor/srmediathek.py | 5 +- youtube_dl/extractor/stanfordoc.py | 6 +- youtube_dl/extractor/steam.py | 2 +- youtube_dl/extractor/stitcher.py | 2 +- youtube_dl/extractor/storyfire.py | 7 +- youtube_dl/extractor/streamable.py | 6 +- youtube_dl/extractor/streamcloud.py | 5 +- youtube_dl/extractor/sunporno.py | 7 +- youtube_dl/extractor/sverigesradio.py | 6 +- youtube_dl/extractor/svt.py | 2 +- youtube_dl/extractor/swrmediathek.py | 6 +- youtube_dl/extractor/syfy.py | 5 +- youtube_dl/extractor/tagesschau.py | 7 +- youtube_dl/extractor/tass.py | 5 +- youtube_dl/extractor/tbs.py | 11 +- youtube_dl/extractor/teachable.py | 4 +- youtube_dl/extractor/teachertube.py | 6 +- youtube_dl/extractor/teamcoco.py | 2 +- youtube_dl/extractor/teamtreehouse.py | 2 +- youtube_dl/extractor/techtalks.py | 5 +- youtube_dl/extractor/ted.py | 6 +- youtube_dl/extractor/tele13.py | 6 +- youtube_dl/extractor/tele5.py | 8 +- youtube_dl/extractor/telecinco.py | 7 +- youtube_dl/extractor/telegraaf.py | 7 +- youtube_dl/extractor/telequebec.py | 7 +- youtube_dl/extractor/tennistv.py | 6 +- youtube_dl/extractor/tenplay.py | 7 +- youtube_dl/extractor/tf1.py | 6 +- youtube_dl/extractor/tfo.py | 7 +- youtube_dl/extractor/theintercept.py | 6 +- youtube_dl/extractor/theplatform.py | 20 +- youtube_dl/extractor/thescene.py | 1 - youtube_dl/extractor/theweatherchannel.py | 6 +- youtube_dl/extractor/threeqsdn.py | 2 +- youtube_dl/extractor/tiktok.py | 2 +- youtube_dl/extractor/tmz.py | 5 +- youtube_dl/extractor/toggle.py | 2 +- youtube_dl/extractor/toongoggles.py | 5 +- youtube_dl/extractor/toutv.py | 6 +- youtube_dl/extractor/toypics.py | 3 +- youtube_dl/extractor/trilulilu.py | 6 +- youtube_dl/extractor/trovo.py | 7 +- youtube_dl/extractor/trutv.py | 5 +- youtube_dl/extractor/tube8.py | 5 +- youtube_dl/extractor/tumblr.py | 6 +- youtube_dl/extractor/tunein.py | 2 +- youtube_dl/extractor/tunepk.py | 6 +- youtube_dl/extractor/turbo.py | 7 +- youtube_dl/extractor/turner.py | 16 +- youtube_dl/extractor/tv2.py | 4 +- youtube_dl/extractor/tv2dk.py | 7 +- youtube_dl/extractor/tv4.py | 5 +- youtube_dl/extractor/tv5unis.py | 7 +- youtube_dl/extractor/tva.py | 7 +- youtube_dl/extractor/tvanouvelles.py | 2 +- youtube_dl/extractor/tvc.py | 5 +- youtube_dl/extractor/tver.py | 7 +- youtube_dl/extractor/tvn24.py | 6 +- youtube_dl/extractor/tvnet.py | 6 +- youtube_dl/extractor/tvnoe.py | 6 +- youtube_dl/extractor/tvnow.py | 2 +- youtube_dl/extractor/tvp.py | 2 +- youtube_dl/extractor/tvplay.py | 7 +- youtube_dl/extractor/tvplayer.py | 7 +- youtube_dl/extractor/tweakers.py | 6 +- youtube_dl/extractor/twentyfourvideo.py | 7 +- youtube_dl/extractor/twentymin.py | 5 +- youtube_dl/extractor/twitch.py | 4 +- youtube_dl/extractor/twitter.py | 10 +- youtube_dl/extractor/udemy.py | 2 +- youtube_dl/extractor/udn.py | 6 +- youtube_dl/extractor/umg.py | 6 +- youtube_dl/extractor/uol.py | 5 +- youtube_dl/extractor/uplynk.py | 5 +- youtube_dl/extractor/urort.py | 8 +- youtube_dl/extractor/urplay.py | 4 +- youtube_dl/extractor/usatoday.py | 2 +- youtube_dl/extractor/ustream.py | 9 +- youtube_dl/extractor/ustudio.py | 6 +- youtube_dl/extractor/varzesh3.py | 10 +- youtube_dl/extractor/veehd.py | 13 +- youtube_dl/extractor/veoh.py | 6 +- youtube_dl/extractor/vesti.py | 2 +- youtube_dl/extractor/vevo.py | 14 +- youtube_dl/extractor/vgtv.py | 6 +- youtube_dl/extractor/vice.py | 9 +- youtube_dl/extractor/vidbit.py | 7 +- youtube_dl/extractor/viddler.py | 5 +- youtube_dl/extractor/videa.py | 12 +- youtube_dl/extractor/videofyme.py | 5 +- youtube_dl/extractor/videomore.py | 11 +- youtube_dl/extractor/vidme.py | 2 +- youtube_dl/extractor/vier.py | 8 +- youtube_dl/extractor/viewlift.py | 6 +- youtube_dl/extractor/viidea.py | 13 +- youtube_dl/extractor/vimeo.py | 12 +- youtube_dl/extractor/vine.py | 6 +- youtube_dl/extractor/viqeo.py | 6 +- youtube_dl/extractor/viu.py | 10 +- youtube_dl/extractor/vk.py | 14 +- youtube_dl/extractor/vlive.py | 5 +- youtube_dl/extractor/vodlocker.py | 2 +- youtube_dl/extractor/voicerepublic.py | 7 +- youtube_dl/extractor/voot.py | 7 +- youtube_dl/extractor/voxmedia.py | 7 +- youtube_dl/extractor/vrak.py | 9 +- youtube_dl/extractor/vrv.py | 10 +- youtube_dl/extractor/vshare.py | 5 +- youtube_dl/extractor/vtm.py | 6 +- youtube_dl/extractor/vube.py | 9 +- youtube_dl/extractor/vuclip.py | 10 +- youtube_dl/extractor/vvvvid.py | 6 +- youtube_dl/extractor/vzaar.py | 7 +- youtube_dl/extractor/wakanim.py | 6 +- youtube_dl/extractor/walla.py | 5 +- youtube_dl/extractor/wat.py | 7 +- youtube_dl/extractor/wdr.py | 9 +- youtube_dl/extractor/webcaster.py | 5 +- youtube_dl/extractor/webofstories.py | 5 +- youtube_dl/extractor/weibo.py | 14 +- youtube_dl/extractor/wsj.py | 6 +- youtube_dl/extractor/wwe.py | 7 +- youtube_dl/extractor/xboxclips.py | 11 +- youtube_dl/extractor/xfileshare.py | 2 +- youtube_dl/extractor/xhamster.py | 2 +- youtube_dl/extractor/xminus.py | 9 +- youtube_dl/extractor/xnxx.py | 7 +- youtube_dl/extractor/xstream.py | 4 +- youtube_dl/extractor/xvideos.py | 2 +- youtube_dl/extractor/xxxymovies.py | 5 +- youtube_dl/extractor/yahoo.py | 10 +- youtube_dl/extractor/yandexmusic.py | 7 +- youtube_dl/extractor/yandexvideo.py | 7 +- youtube_dl/extractor/yesjapan.py | 6 +- youtube_dl/extractor/ynet.py | 2 +- youtube_dl/extractor/youjizz.py | 7 +- youtube_dl/extractor/younow.py | 6 +- youtube_dl/extractor/yourporn.py | 5 +- youtube_dl/extractor/youtube.py | 5 +- youtube_dl/extractor/zapiks.py | 4 +- youtube_dl/extractor/zattoo.py | 5 +- youtube_dl/extractor/zdf.py | 4 +- youtube_dl/extractor/zingmp3.py | 5 +- youtube_dl/extractor/zype.py | 2 +- youtube_dl/jsinterp.py | 12 +- youtube_dl/options.py | 9 +- youtube_dl/postprocessor/__init__.py | 10 +- youtube_dl/postprocessor/common.py | 6 +- youtube_dl/postprocessor/embedthumbnail.py | 4 +- youtube_dl/postprocessor/execafterdownload.py | 5 +- youtube_dl/postprocessor/ffmpeg.py | 13 +- youtube_dl/postprocessor/xattrpp.py | 4 +- youtube_dl/socks.py | 13 +- youtube_dl/swfinterp.py | 9 +- youtube_dl/update.py | 5 +- youtube_dl/utils.py | 16 +- 606 files changed, 1486 insertions(+), 3854 deletions(-) diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py index 3d1391334..4b5f0a8b3 100755 --- a/devscripts/bash-completion.py +++ b/devscripts/bash-completion.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import os -from os.path import dirname as dirn import sys +from os.path import dirname as dirn sys.path.insert(0, dirn(dirn((os.path.abspath(__file__))))) import youtube_dl diff --git a/devscripts/buildserver.py b/devscripts/buildserver.py index 96a565b4c..d9ecab666 100644 --- a/devscripts/buildserver.py +++ b/devscripts/buildserver.py @@ -3,18 +3,18 @@ import argparse import ctypes import functools +import os.path import shutil import subprocess import sys import tempfile import threading import traceback -import os.path sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__))))) from youtube_dl.compat import ( - compat_input, compat_http_server, + compat_input, compat_str, compat_urlparse, ) diff --git a/devscripts/check-porn.py b/devscripts/check-porn.py index 740f04de0..a0804164f 100644 --- a/devscripts/check-porn.py +++ b/devscripts/check-porn.py @@ -12,11 +12,11 @@ pass the list filename as the only argument # Allow direct execution import os import sys + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import gettestcases -from youtube_dl.utils import compat_urllib_parse_urlparse -from youtube_dl.utils import compat_urllib_request +from youtube_dl.utils import compat_urllib_parse_urlparse, compat_urllib_request if len(sys.argv) > 1: METHOD = 'LIST' diff --git a/devscripts/create-github-release.py b/devscripts/create-github-release.py index 2ddfa1096..2bc767556 100644 --- a/devscripts/create-github-release.py +++ b/devscripts/create-github-release.py @@ -18,10 +18,7 @@ from youtube_dl.compat import ( compat_print, compat_urllib_request, ) -from youtube_dl.utils import ( - make_HTTPS_handler, - sanitized_Request, -) +from youtube_dl.utils import make_HTTPS_handler, sanitized_Request class GitHubReleaser(object): diff --git a/devscripts/fish-completion.py b/devscripts/fish-completion.py index 51d19dd33..23f754125 100755 --- a/devscripts/fish-completion.py +++ b/devscripts/fish-completion.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import optparse import os -from os.path import dirname as dirn import sys +from os.path import dirname as dirn sys.path.insert(0, dirn(dirn((os.path.abspath(__file__))))) import youtube_dl diff --git a/devscripts/generate_aes_testdata.py b/devscripts/generate_aes_testdata.py index e3df42cc2..092ab3159 100644 --- a/devscripts/generate_aes_testdata.py +++ b/devscripts/generate_aes_testdata.py @@ -1,14 +1,14 @@ from __future__ import unicode_literals import codecs -import subprocess - import os +import subprocess import sys + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.utils import intlist_to_bytes from youtube_dl.aes import aes_encrypt, key_expansion +from youtube_dl.utils import intlist_to_bytes secret_msg = b'Secret message goes here' diff --git a/devscripts/gh-pages/add-version.py b/devscripts/gh-pages/add-version.py index 867ea0048..a15b25e56 100755 --- a/devscripts/gh-pages/add-version.py +++ b/devscripts/gh-pages/add-version.py @@ -1,11 +1,10 @@ #!/usr/bin/env python3 from __future__ import unicode_literals -import json -import sys import hashlib +import json import os.path - +import sys if len(sys.argv) <= 1: print('Specify the version number as parameter') diff --git a/devscripts/gh-pages/sign-versions.py b/devscripts/gh-pages/sign-versions.py index fa389c358..223bae317 100755 --- a/devscripts/gh-pages/sign-versions.py +++ b/devscripts/gh-pages/sign-versions.py @@ -1,10 +1,11 @@ #!/usr/bin/env python3 from __future__ import unicode_literals, with_statement -import rsa import json from binascii import hexlify +import rsa + try: input = raw_input except NameError: diff --git a/devscripts/gh-pages/update-copyright.py b/devscripts/gh-pages/update-copyright.py index 61487f925..9a2713e06 100755 --- a/devscripts/gh-pages/update-copyright.py +++ b/devscripts/gh-pages/update-copyright.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # coding: utf-8 -from __future__ import with_statement, unicode_literals +from __future__ import unicode_literals, with_statement import datetime import glob diff --git a/devscripts/gh-pages/update-feed.py b/devscripts/gh-pages/update-feed.py index 635c2f6b9..7197fabb0 100755 --- a/devscripts/gh-pages/update-feed.py +++ b/devscripts/gh-pages/update-feed.py @@ -6,7 +6,6 @@ import io import json import textwrap - atom_template = textwrap.dedent("""\ diff --git a/devscripts/gh-pages/update-sites.py b/devscripts/gh-pages/update-sites.py index 531c93c70..5c7e2e8cd 100755 --- a/devscripts/gh-pages/update-sites.py +++ b/devscripts/gh-pages/update-sites.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 from __future__ import unicode_literals -import sys import os +import sys import textwrap # We must be able to import youtube_dl diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py index 878ae72b1..d826df3a3 100644 --- a/devscripts/make_lazy_extractors.py +++ b/devscripts/make_lazy_extractors.py @@ -1,10 +1,10 @@ -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals -from inspect import getsource import io import os -from os.path import dirname as dirn import sys +from inspect import getsource +from os.path import dirname as dirn print('WARNING: Lazy loading extractors is an experimental feature that may not always work', file=sys.stderr) diff --git a/devscripts/make_readme.py b/devscripts/make_readme.py index 8fbce0796..d1bc60ca5 100755 --- a/devscripts/make_readme.py +++ b/devscripts/make_readme.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals import io -import sys import re +import sys README_FILE = 'README.md' helptext = sys.stdin.read() diff --git a/devscripts/make_supportedsites.py b/devscripts/make_supportedsites.py index 764795bc5..aca14ef70 100644 --- a/devscripts/make_supportedsites.py +++ b/devscripts/make_supportedsites.py @@ -6,7 +6,6 @@ import optparse import os import sys - # Import youtube_dl ROOT_DIR = os.path.join(os.path.dirname(__file__), '..') sys.path.insert(0, ROOT_DIR) diff --git a/devscripts/show-downloads-statistics.py b/devscripts/show-downloads-statistics.py index 6c8d1cc2d..a82d2a838 100644 --- a/devscripts/show-downloads-statistics.py +++ b/devscripts/show-downloads-statistics.py @@ -9,10 +9,7 @@ import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.compat import ( - compat_print, - compat_urllib_request, -) +from youtube_dl.compat import compat_print, compat_urllib_request from youtube_dl.utils import format_bytes diff --git a/devscripts/zsh-completion.py b/devscripts/zsh-completion.py index 60aaf76cc..3c9f6e179 100755 --- a/devscripts/zsh-completion.py +++ b/devscripts/zsh-completion.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import os -from os.path import dirname as dirn import sys +from os.path import dirname as dirn sys.path.insert(0, dirn(dirn((os.path.abspath(__file__))))) import youtube_dl diff --git a/docs/conf.py b/docs/conf.py index 0aaf1b8fc..7cf0dd241 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,8 +12,9 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys import os +import sys + # Allows to import youtube_dl sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) @@ -45,6 +46,7 @@ copyright = u'2014, Ricardo Garcia Gonzalez' # # The short X.Y version. from youtube_dl.version import __version__ + version = __version__ # The full version, including alpha/beta/rc tags. release = version diff --git a/setup.py b/setup.py index cd05075e6..ab69b33cf 100644 --- a/setup.py +++ b/setup.py @@ -4,14 +4,14 @@ from __future__ import print_function import os.path -import warnings import sys +import warnings try: - from setuptools import setup, Command + from setuptools import Command, setup setuptools_available = True except ImportError: - from distutils.core import setup, Command + from distutils.core import Command, setup setuptools_available = False from distutils.spawn import spawn diff --git a/test/helper.py b/test/helper.py index c6a2f0667..a3e6f19be 100644 --- a/test/helper.py +++ b/test/helper.py @@ -1,25 +1,19 @@ from __future__ import unicode_literals import errno -import io import hashlib +import io import json import os.path import re -import types import ssl import sys +import types import youtube_dl.extractor from youtube_dl import YoutubeDL -from youtube_dl.compat import ( - compat_os_name, - compat_str, -) -from youtube_dl.utils import ( - preferredencoding, - write_string, -) +from youtube_dl.compat import compat_os_name, compat_str +from youtube_dl.utils import preferredencoding, write_string def get_params(override=None): diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py index dd69a681b..b207d6862 100644 --- a/test/test_InfoExtractor.py +++ b/test/test_InfoExtractor.py @@ -7,15 +7,21 @@ import io import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +import threading + from test.helper import FakeYDL, expect_dict, expect_value, http_server_port from youtube_dl.compat import compat_etree_fromstring, compat_http_server -from youtube_dl.extractor.common import InfoExtractor from youtube_dl.extractor import YoutubeIE, get_info_extractor -from youtube_dl.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError -import threading - +from youtube_dl.extractor.common import InfoExtractor +from youtube_dl.utils import ( + ExtractorError, + RegexNotFoundError, + encode_data_uri, + strip_jsonp, +) TEAPOT_RESPONSE_STATUS = 418 TEAPOT_RESPONSE_BODY = "

418 I'm a teapot

" diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py index f8c8e619c..47f986a28 100644 --- a/test/test_YoutubeDL.py +++ b/test/test_YoutubeDL.py @@ -7,6 +7,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import copy diff --git a/test/test_YoutubeDLCookieJar.py b/test/test_YoutubeDLCookieJar.py index 05f48bd74..3d7544ca7 100644 --- a/test/test_YoutubeDLCookieJar.py +++ b/test/test_YoutubeDLCookieJar.py @@ -8,6 +8,7 @@ import re import sys import tempfile import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from youtube_dl.utils import YoutubeDLCookieJar diff --git a/test/test_aes.py b/test/test_aes.py index 0f181466b..51b04166f 100644 --- a/test/test_aes.py +++ b/test/test_aes.py @@ -6,12 +6,21 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text, aes_ecb_encrypt -from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes import base64 +from youtube_dl.aes import ( + aes_cbc_decrypt, + aes_cbc_encrypt, + aes_decrypt, + aes_decrypt_text, + aes_ecb_encrypt, + aes_encrypt, +) +from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes + # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py' diff --git a/test/test_age_restriction.py b/test/test_age_restriction.py index 6f5513faa..539bed6e5 100644 --- a/test/test_age_restriction.py +++ b/test/test_age_restriction.py @@ -5,11 +5,10 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import try_rm - - from youtube_dl import YoutubeDL diff --git a/test/test_all_urls.py b/test/test_all_urls.py index 26df356b4..f885126ba 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -2,21 +2,18 @@ from __future__ import unicode_literals +import collections + # Allow direct execution import os import sys import unittest -import collections + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import gettestcases - -from youtube_dl.extractor import ( - FacebookIE, - gen_extractors, - YoutubeIE, -) +from youtube_dl.extractor import FacebookIE, YoutubeIE, gen_extractors class TestAllURLsMatching(unittest.TestCase): diff --git a/test/test_cache.py b/test/test_cache.py index 931074aa1..d6b46c348 100644 --- a/test/test_cache.py +++ b/test/test_cache.py @@ -7,6 +7,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import shutil diff --git a/test/test_compat.py b/test/test_compat.py index 0986cff37..086f89e57 100644 --- a/test/test_compat.py +++ b/test/test_compat.py @@ -7,16 +7,17 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from youtube_dl.compat import ( compat_casefold, - compat_getenv, - compat_setenv, compat_etree_Element, compat_etree_fromstring, compat_expanduser, + compat_getenv, + compat_setenv, compat_shlex_split, compat_str, compat_struct_unpack, diff --git a/test/test_download.py b/test/test_download.py index 19936969f..3b85fa0ba 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -6,38 +6,37 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from test.helper import ( - assertGreaterEqual, - expect_warnings, - get_params, - gettestcases, - expect_info_dict, - try_rm, - report_warning, -) - - import hashlib import io import json import socket import youtube_dl.YoutubeDL +from test.helper import ( + assertGreaterEqual, + expect_info_dict, + expect_warnings, + get_params, + gettestcases, + report_warning, + try_rm, +) from youtube_dl.compat import ( compat_http_client, - compat_urllib_error, compat_HTTPError, + compat_urllib_error, ) +from youtube_dl.extractor import get_info_extractor from youtube_dl.utils import ( DownloadError, ExtractorError, + UnavailableVideoError, error_to_compat_str, format_bytes, - UnavailableVideoError, ) -from youtube_dl.extractor import get_info_extractor RETRIES = 3 diff --git a/test/test_downloader_http.py b/test/test_downloader_http.py index 750472281..7065a91e7 100644 --- a/test/test_downloader_http.py +++ b/test/test_downloader_http.py @@ -7,14 +7,16 @@ import os import re import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +import threading + from test.helper import http_server_port, try_rm from youtube_dl import YoutubeDL from youtube_dl.compat import compat_http_server from youtube_dl.downloader.http import HttpFD from youtube_dl.utils import encodeFilename -import threading TEST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/test/test_execution.py b/test/test_execution.py index 32948d93e..d7346ead3 100644 --- a/test/test_execution.py +++ b/test/test_execution.py @@ -3,11 +3,11 @@ from __future__ import unicode_literals -import unittest - -import sys import os import subprocess +import sys +import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from youtube_dl.utils import encodeArgument diff --git a/test/test_http.py b/test/test_http.py index 3ee0a5dda..0fb397fcb 100644 --- a/test/test_http.py +++ b/test/test_http.py @@ -6,13 +6,15 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +import ssl +import threading + from test.helper import http_server_port from youtube_dl import YoutubeDL from youtube_dl.compat import compat_http_server, compat_urllib_request -import ssl -import threading TEST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/test/test_iqiyi_sdk_interpreter.py b/test/test_iqiyi_sdk_interpreter.py index 789059dbe..b55e8241d 100644 --- a/test/test_iqiyi_sdk_interpreter.py +++ b/test/test_iqiyi_sdk_interpreter.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import FakeYDL diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py index 5121c8cf8..cd944ddcf 100644 --- a/test/test_jsinterp.py +++ b/test/test_jsinterp.py @@ -6,13 +6,13 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import math import re from youtube_dl.compat import compat_re_Pattern - from youtube_dl.jsinterp import JS_Undefined, JSInterpreter diff --git a/test/test_netrc.py b/test/test_netrc.py index 7cf3a6a2e..716cedb46 100644 --- a/test/test_netrc.py +++ b/test/test_netrc.py @@ -4,12 +4,11 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.extractor import ( - gen_extractors, -) +from youtube_dl.extractor import gen_extractors class TestNetRc(unittest.TestCase): diff --git a/test/test_options.py b/test/test_options.py index 3a25a6ba3..78a2586b5 100644 --- a/test/test_options.py +++ b/test/test_options.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from youtube_dl.options import _hide_login_info diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py index 4209d1d9a..a9ec3eafa 100644 --- a/test/test_postprocessors.py +++ b/test/test_postprocessors.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from youtube_dl.postprocessor import MetadataFromTitlePP diff --git a/test/test_socks.py b/test/test_socks.py index 1e68eb0da..109ff6255 100644 --- a/test/test_socks.py +++ b/test/test_socks.py @@ -6,19 +6,14 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import random import subprocess -from test.helper import ( - FakeYDL, - get_params, -) -from youtube_dl.compat import ( - compat_str, - compat_urllib_request, -) +from test.helper import FakeYDL, get_params +from youtube_dl.compat import compat_str, compat_urllib_request class TestMultipleSocks(unittest.TestCase): diff --git a/test/test_subtitles.py b/test/test_subtitles.py index 1197721ff..140463210 100644 --- a/test/test_subtitles.py +++ b/test/test_subtitles.py @@ -5,28 +5,27 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import FakeYDL, md5 - - from youtube_dl.extractor import ( - YoutubeIE, - DailymotionIE, + NPOIE, + NRKTVIE, TEDIE, + CeskaTelevizeIE, + ComedyCentralIE, + DailymotionIE, + DemocracynowIE, + LyndaIE, + RaiPlayIE, + RTVEALaCartaIE, + ThePlatformFeedIE, + ThePlatformIE, + VikiIE, VimeoIE, WallaIE, - CeskaTelevizeIE, - LyndaIE, - NPOIE, - ComedyCentralIE, - NRKTVIE, - RaiPlayIE, - VikiIE, - ThePlatformIE, - ThePlatformFeedIE, - RTVEALaCartaIE, - DemocracynowIE, + YoutubeIE, ) diff --git a/test/test_swfinterp.py b/test/test_swfinterp.py index 9f18055e6..21cb199f1 100644 --- a/test/test_swfinterp.py +++ b/test/test_swfinterp.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) @@ -16,7 +17,6 @@ import subprocess from youtube_dl.swfinterp import SWFInterpreter - TEST_DIR = os.path.join( os.path.dirname(os.path.abspath(__file__)), 'swftests') diff --git a/test/test_unicode_literals.py b/test/test_unicode_literals.py index 6c1b7ec91..912f0513b 100644 --- a/test/test_unicode_literals.py +++ b/test/test_unicode_literals.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import io diff --git a/test/test_update.py b/test/test_update.py index d9c71511d..a968f7590 100644 --- a/test/test_update.py +++ b/test/test_update.py @@ -6,10 +6,12 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import json + from youtube_dl.update import rsa_verify diff --git a/test/test_utils.py b/test/test_utils.py index 9d364c863..90bc3e70b 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -7,6 +7,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) @@ -17,66 +18,86 @@ import json import re import xml.etree.ElementTree +from youtube_dl.compat import ( + compat_chr, + compat_etree_fromstring, + compat_getenv, + compat_os_name, + compat_parse_qs, + compat_setenv, + compat_str, + compat_urlparse, +) from youtube_dl.utils import ( + DateRange, + ExtractorError, + InAdvancePagedList, + LazyList, + OnDemandPagedList, age_restricted, args_to_str, - encode_base_n, + base_url, caesar, clean_html, clean_podcast_url, + cli_bool_option, + cli_option, + cli_valueless_option, date_from_str, - DateRange, detect_exe_version, determine_ext, + dfxp2srt, dict_get, + encode_base_n, encode_compat_str, encodeFilename, escape_rfc3986, escape_url, + expand_path, extract_attributes, - ExtractorError, find_xpath_attr, fix_xml_ampersands, float_or_none, - get_element_by_class, get_element_by_attribute, - get_elements_by_class, + get_element_by_class, get_elements_by_attribute, + get_elements_by_class, get_first, - InAdvancePagedList, int_or_none, intlist_to_bytes, is_html, join_nonempty, js_to_json, - LazyList, limit_length, + lowercase_escape, + match_str, merge_dicts, mimetype2ext, month_by_name, multipart_encode, ohdave_rsa_encrypt, - OnDemandPagedList, orderedSet, parse_age_limit, + parse_bitrate, + parse_codecs, + parse_count, + parse_dfxp_time_expr, parse_duration, parse_filesize, - parse_count, parse_iso8601, parse_resolution, - parse_bitrate, pkcs1pad, + prepend_extension, read_batch_urls, + remove_end, + remove_quotes, + remove_start, + render_table, + replace_extension, + rot47, sanitize_filename, sanitize_path, sanitize_url, - expand_path, - prepend_extension, - replace_extension, - remove_start, - remove_end, - remove_quotes, - rot47, shell_quote, smuggle_url, str_to_int, @@ -90,39 +111,19 @@ from youtube_dl.utils import ( unified_strdate, unified_timestamp, unsmuggle_url, + update_url_query, uppercase_escape, - lowercase_escape, url_basename, url_or_none, - base_url, - urljoin, urlencode_postdata, + urljoin, urshift, - update_url_query, variadic, version_tuple, - xpath_with_ns, + xpath_attr, xpath_element, xpath_text, - xpath_attr, - render_table, - match_str, - parse_dfxp_time_expr, - dfxp2srt, - cli_option, - cli_valueless_option, - cli_bool_option, - parse_codecs, -) -from youtube_dl.compat import ( - compat_chr, - compat_etree_fromstring, - compat_getenv, - compat_os_name, - compat_setenv, - compat_str, - compat_urlparse, - compat_parse_qs, + xpath_with_ns, ) diff --git a/test/test_verbose_output.py b/test/test_verbose_output.py index c1465fe8c..4e7ee4247 100644 --- a/test/test_verbose_output.py +++ b/test/test_verbose_output.py @@ -3,11 +3,11 @@ from __future__ import unicode_literals -import unittest - -import sys import os import subprocess +import sys +import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py index 41abdfe3b..10ed2f4d3 100644 --- a/test/test_write_annotations.py +++ b/test/test_write_annotations.py @@ -6,17 +6,15 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from test.helper import get_params, try_rm - - import io - import xml.etree.ElementTree -import youtube_dl.YoutubeDL import youtube_dl.extractor +import youtube_dl.YoutubeDL +from test.helper import get_params, try_rm class YoutubeDL(youtube_dl.YoutubeDL): diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index e0e8891ba..73146a47b 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -6,15 +6,11 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import FakeYDL - -from youtube_dl.extractor import ( - YoutubeIE, - YoutubePlaylistIE, - YoutubeTabIE, -) +from youtube_dl.extractor import YoutubeIE, YoutubePlaylistIE, YoutubeTabIE class TestYoutubeLists(unittest.TestCase): diff --git a/test/test_youtube_misc.py b/test/test_youtube_misc.py index e18e71101..14e3d0d8c 100644 --- a/test/test_youtube_misc.py +++ b/test/test_youtube_misc.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py index 4e678cae0..bf6d262d1 100644 --- a/test/test_youtube_signature.py +++ b/test/test_youtube_signature.py @@ -6,15 +6,15 @@ from __future__ import unicode_literals import os import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import io import re import string -from youtube_dl.compat import compat_str, compat_urlretrieve - from test.helper import FakeYDL +from youtube_dl.compat import compat_str, compat_urlretrieve from youtube_dl.extractor import YoutubeIE from youtube_dl.jsinterp import JSInterpreter diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 8e8546596..ef377111d 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -16,18 +16,18 @@ import locale import operator import os import platform +import random import re import shutil -import subprocess import socket +import subprocess import sys import time import tokenize import traceback -import random - from string import ascii_letters +from .cache import Cache from .compat import ( compat_basestring, compat_cookiejar, @@ -42,64 +42,10 @@ from .compat import ( compat_urllib_request, compat_urllib_request_DataHandler, ) -from .utils import ( - age_restricted, - args_to_str, - ContentTooShortError, - date_from_str, - DateRange, - DEFAULT_OUTTMPL, - determine_ext, - determine_protocol, - DownloadError, - encode_compat_str, - encodeFilename, - error_to_compat_str, - expand_path, - ExtractorError, - format_bytes, - formatSeconds, - GeoRestrictedError, - int_or_none, - ISO3166Utils, - locked_file, - make_HTTPS_handler, - MaxDownloadsReached, - orderedSet, - PagedList, - parse_filesize, - PerRequestProxyHandler, - platform_name, - PostProcessingError, - preferredencoding, - prepend_extension, - process_communicate_or_kill, - register_socks_protocols, - render_table, - replace_extension, - SameFileError, - sanitize_filename, - sanitize_path, - sanitize_url, - sanitized_Request, - std_headers, - str_or_none, - subtitles_filename, - UnavailableVideoError, - url_basename, - version_tuple, - write_json_file, - write_string, - YoutubeDLCookieJar, - YoutubeDLCookieProcessor, - YoutubeDLHandler, - YoutubeDLRedirectHandler, -) -from .cache import Cache -from .extractor import get_info_extractor, gen_extractor_classes, _LAZY_LOADER -from .extractor.openload import PhantomJSwrapper from .downloader import get_suitable_downloader from .downloader.rtmp import rtmpdump_version +from .extractor import _LAZY_LOADER, gen_extractor_classes, get_info_extractor +from .extractor.openload import PhantomJSwrapper from .postprocessor import ( FFmpegFixupM3u8PP, FFmpegFixupM4aPP, @@ -108,6 +54,59 @@ from .postprocessor import ( FFmpegPostProcessor, get_postprocessor, ) +from .utils import ( + DEFAULT_OUTTMPL, + ContentTooShortError, + DateRange, + DownloadError, + ExtractorError, + GeoRestrictedError, + ISO3166Utils, + MaxDownloadsReached, + PagedList, + PerRequestProxyHandler, + PostProcessingError, + SameFileError, + UnavailableVideoError, + YoutubeDLCookieJar, + YoutubeDLCookieProcessor, + YoutubeDLHandler, + YoutubeDLRedirectHandler, + age_restricted, + args_to_str, + date_from_str, + determine_ext, + determine_protocol, + encode_compat_str, + encodeFilename, + error_to_compat_str, + expand_path, + format_bytes, + formatSeconds, + int_or_none, + locked_file, + make_HTTPS_handler, + orderedSet, + parse_filesize, + platform_name, + preferredencoding, + prepend_extension, + process_communicate_or_kill, + register_socks_protocols, + render_table, + replace_extension, + sanitize_filename, + sanitize_path, + sanitize_url, + sanitized_Request, + std_headers, + str_or_none, + subtitles_filename, + url_basename, + version_tuple, + write_json_file, + write_string, +) from .version import __version__ if compat_os_name == 'nt': diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index e1bd67919..ed061fe64 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -11,37 +11,32 @@ import os import random import sys - -from .options import ( - parseOpts, -) from .compat import ( compat_getpass, compat_shlex_split, workaround_optparse_bug9161, ) +from .downloader import FileDownloader +from .extractor import gen_extractors, list_extractors +from .extractor.adobepass import MSO_INFO +from .options import parseOpts +from .update import update_self from .utils import ( - DateRange, - decodeOption, DEFAULT_OUTTMPL, + DateRange, DownloadError, + MaxDownloadsReached, + SameFileError, + decodeOption, expand_path, match_filter_func, - MaxDownloadsReached, preferredencoding, read_batch_urls, - SameFileError, + render_table, setproctitle, std_headers, write_string, - render_table, ) -from .update import update_self -from .downloader import ( - FileDownloader, -) -from .extractor import gen_extractors, list_extractors -from .extractor.adobepass import MSO_INFO from .YoutubeDL import YoutubeDL diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py index 138f5fbec..55fd64e11 100755 --- a/youtube_dl/__main__.py +++ b/youtube_dl/__main__.py @@ -1,11 +1,12 @@ #!/usr/bin/env python from __future__ import unicode_literals +import sys + # Execute with # $ python youtube_dl/__main__.py (2.6+) # $ python -m youtube_dl (2.7+) -import sys if __package__ is None and not hasattr(sys, 'frozen'): # direct call of __main__.py diff --git a/youtube_dl/casefold.py b/youtube_dl/casefold.py index 748c2d491..1e805da5d 100644 --- a/youtube_dl/casefold.py +++ b/youtube_dl/casefold.py @@ -1,10 +1,7 @@ # coding: utf-8 from __future__ import unicode_literals -from .compat import ( - compat_str, - compat_chr, -) +from .compat import compat_chr, compat_str # Below is included the text of icu/CaseFolding.txt retrieved from # https://github.com/unicode-org/icu/blob/main/icu4c/source/data/unidata/CaseFolding.txt diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index fb154414f..4e24e5ed3 100644 --- a/youtube_dl/compat.py +++ b/youtube_dl/compat.py @@ -2387,9 +2387,10 @@ except ImportError: import BaseHTTPServer as compat_http_server try: - from urllib.parse import unquote_to_bytes as compat_urllib_parse_unquote_to_bytes from urllib.parse import unquote as compat_urllib_parse_unquote from urllib.parse import unquote_plus as compat_urllib_parse_unquote_plus + from urllib.parse import \ + unquote_to_bytes as compat_urllib_parse_unquote_to_bytes except ImportError: # Python 2 _asciire = (compat_urllib_parse._asciire if hasattr(compat_urllib_parse, '_asciire') else re.compile(r'([\x00-\x7f]+)')) @@ -3001,6 +3002,7 @@ except ImportError: # new class in collections try: from collections import ChainMap as compat_collections_chain_map + # Py3.3's ChainMap is deficient if sys.version_info < (3, 4): raise ImportError diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py index d701d6292..e112978d8 100644 --- a/youtube_dl/downloader/__init__.py +++ b/youtube_dl/downloader/__init__.py @@ -1,8 +1,6 @@ from __future__ import unicode_literals -from ..utils import ( - determine_protocol, -) +from ..utils import determine_protocol def get_suitable_downloader(info_dict, params={}): @@ -14,17 +12,14 @@ def get_suitable_downloader(info_dict, params={}): # Some of these require get_suitable_downloader from .common import FileDownloader from .dash import DashSegmentsFD +from .external import FFmpegFD, get_external_downloader from .f4m import F4mFD from .hls import HlsFD from .http import HttpFD -from .rtmp import RtmpFD -from .rtsp import RtspFD from .ism import IsmFD from .niconico import NiconicoDmcFD -from .external import ( - get_external_downloader, - FFmpegFD, -) +from .rtmp import RtmpFD +from .rtsp import RtspFD PROTOCOL_MAP = { 'rtmp': RtmpFD, diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py index 1cdba89cd..6ecb90c8f 100644 --- a/youtube_dl/downloader/common.py +++ b/youtube_dl/downloader/common.py @@ -1,10 +1,10 @@ from __future__ import division, unicode_literals import os +import random import re import sys import time -import random from ..compat import compat_os_name from ..utils import ( diff --git a/youtube_dl/downloader/dash.py b/youtube_dl/downloader/dash.py index c6d674bc6..6a9e68b5a 100644 --- a/youtube_dl/downloader/dash.py +++ b/youtube_dl/downloader/dash.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .fragment import FragmentFD from ..compat import compat_urllib_error -from ..utils import ( - DownloadError, - urljoin, -) +from ..utils import DownloadError, urljoin class DashSegmentsFD(FragmentFD): diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index a06ab2e50..24da72a8d 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -7,20 +7,17 @@ import sys import time from .common import FileDownloader -from ..compat import ( - compat_setenv, - compat_str, -) -from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS +from ..compat import compat_setenv, compat_str +from ..postprocessor.ffmpeg import EXT_TO_OUT_FORMATS, FFmpegPostProcessor from ..utils import ( - cli_option, - cli_valueless_option, + check_executable, cli_bool_option, cli_configuration_args, - encodeFilename, + cli_option, + cli_valueless_option, encodeArgument, + encodeFilename, handle_youtubedl_headers, - check_executable, is_outdated_version, process_communicate_or_kill, ) diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py index 8dd3c2eeb..416802b83 100644 --- a/youtube_dl/downloader/f4m.py +++ b/youtube_dl/downloader/f4m.py @@ -8,16 +8,13 @@ from .fragment import FragmentFD from ..compat import ( compat_b64decode, compat_etree_fromstring, - compat_urlparse, - compat_urllib_error, - compat_urllib_parse_urlparse, compat_struct_pack, compat_struct_unpack, + compat_urllib_error, + compat_urllib_parse_urlparse, + compat_urlparse, ) -from ..utils import ( - fix_xml_ampersands, - xpath_text, -) +from ..utils import fix_xml_ampersands, xpath_text class DataTruncatedError(Exception): diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 35c76feba..199c690c6 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -1,14 +1,14 @@ from __future__ import division, unicode_literals +import json import os import time -import json from .common import FileDownloader from .http import HttpFD from ..utils import ( - error_to_compat_str, encodeFilename, + error_to_compat_str, sanitize_open, sanitized_Request, ) diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py index 7aaebc940..622244e19 100644 --- a/youtube_dl/downloader/hls.py +++ b/youtube_dl/downloader/hls.py @@ -1,25 +1,18 @@ from __future__ import unicode_literals -import re import binascii +import re + try: from Crypto.Cipher import AES can_decrypt_frag = True except ImportError: can_decrypt_frag = False -from .fragment import FragmentFD from .external import FFmpegFD - -from ..compat import ( - compat_urllib_error, - compat_urlparse, - compat_struct_pack, -) -from ..utils import ( - parse_m3u8_attributes, - update_url_query, -) +from .fragment import FragmentFD +from ..compat import compat_struct_pack, compat_urllib_error, compat_urlparse +from ..utils import parse_m3u8_attributes, update_url_query class HlsFD(FragmentFD): diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py index d8ac41dcc..37b373a6b 100644 --- a/youtube_dl/downloader/http.py +++ b/youtube_dl/downloader/http.py @@ -2,25 +2,22 @@ from __future__ import unicode_literals import errno import os -import socket -import time import random import re +import socket +import time from .common import FileDownloader -from ..compat import ( - compat_str, - compat_urllib_error, -) +from ..compat import compat_str, compat_urllib_error from ..utils import ( ContentTooShortError, + XAttrMetadataError, + XAttrUnavailableError, encodeFilename, int_or_none, sanitize_open, sanitized_Request, write_xattr, - XAttrMetadataError, - XAttrUnavailableError, ) diff --git a/youtube_dl/downloader/ism.py b/youtube_dl/downloader/ism.py index 1ca666b4a..6337f2453 100644 --- a/youtube_dl/downloader/ism.py +++ b/youtube_dl/downloader/ism.py @@ -1,15 +1,11 @@ from __future__ import unicode_literals -import time import binascii import io +import time from .fragment import FragmentFD -from ..compat import ( - compat_Struct, - compat_urllib_error, -) - +from ..compat import compat_Struct, compat_urllib_error u8 = compat_Struct('>B') u88 = compat_Struct('>Bx') diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index 8a25dbc8d..ab8369ada 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -9,8 +9,8 @@ from .common import FileDownloader from ..compat import compat_str from ..utils import ( check_executable, - encodeFilename, encodeArgument, + encodeFilename, get_exe_version, ) diff --git a/youtube_dl/downloader/rtsp.py b/youtube_dl/downloader/rtsp.py index 939358b2a..062a96992 100644 --- a/youtube_dl/downloader/rtsp.py +++ b/youtube_dl/downloader/rtsp.py @@ -4,10 +4,7 @@ import os import subprocess from .common import FileDownloader -from ..utils import ( - check_executable, - encodeFilename, -) +from ..utils import check_executable, encodeFilename class RtspFD(FileDownloader): diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index 6637f4f35..557427725 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -9,8 +9,8 @@ from .common import InfoExtractor from ..compat import compat_str from ..utils import ( ExtractorError, - js_to_json, int_or_none, + js_to_json, parse_iso8601, try_get, unescapeHTML, diff --git a/youtube_dl/extractor/abcnews.py b/youtube_dl/extractor/abcnews.py index 908c83377..0257b5986 100644 --- a/youtube_dl/extractor/abcnews.py +++ b/youtube_dl/extractor/abcnews.py @@ -5,11 +5,7 @@ import re from .amp import AMPIE from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, - try_get, -) +from ..utils import parse_duration, parse_iso8601, try_get class AbcNewsVideoIE(AMPIE): diff --git a/youtube_dl/extractor/abcotvs.py b/youtube_dl/extractor/abcotvs.py index 0bc69a64f..7720fb5a4 100644 --- a/youtube_dl/extractor/abcotvs.py +++ b/youtube_dl/extractor/abcotvs.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - dict_get, - int_or_none, - try_get, -) +from ..utils import dict_get, int_or_none, try_get class ABCOTVSIE(InfoExtractor): diff --git a/youtube_dl/extractor/acast.py b/youtube_dl/extractor/acast.py index b9355a2c8..66757e828 100644 --- a/youtube_dl/extractor/acast.py +++ b/youtube_dl/extractor/acast.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - clean_html, - clean_podcast_url, - int_or_none, - parse_iso8601, -) +from ..utils import clean_html, clean_podcast_url, int_or_none, parse_iso8601 class ACastBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/adn.py b/youtube_dl/extractor/adn.py index 5ff419f19..d679b6278 100644 --- a/youtube_dl/extractor/adn.py +++ b/youtube_dl/extractor/adn.py @@ -9,15 +9,11 @@ import random from .common import InfoExtractor from ..aes import aes_cbc_decrypt -from ..compat import ( - compat_HTTPError, - compat_b64decode, - compat_ord, -) +from ..compat import compat_b64decode, compat_HTTPError, compat_ord from ..utils import ( + ExtractorError, bytes_to_intlist, bytes_to_long, - ExtractorError, float_or_none, int_or_none, intlist_to_bytes, diff --git a/youtube_dl/extractor/adobeconnect.py b/youtube_dl/extractor/adobeconnect.py index 728549eb9..36cbdcd50 100644 --- a/youtube_dl/extractor/adobeconnect.py +++ b/youtube_dl/extractor/adobeconnect.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) +from ..compat import compat_parse_qs, compat_urlparse class AdobeConnectIE(InfoExtractor): diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index 38dca1b0a..213f47d6d 100644 --- a/youtube_dl/extractor/adobepass.py +++ b/youtube_dl/extractor/adobepass.py @@ -6,19 +6,15 @@ import time import xml.etree.ElementTree as etree from .common import InfoExtractor -from ..compat import ( - compat_kwargs, - compat_urlparse, -) +from ..compat import compat_kwargs, compat_urlparse from ..utils import ( - unescapeHTML, - urlencode_postdata, - unified_timestamp, - ExtractorError, NO_DEFAULT, + ExtractorError, + unescapeHTML, + unified_timestamp, + urlencode_postdata, ) - MSO_INFO = { 'DTV': { 'name': 'DIRECTV', diff --git a/youtube_dl/extractor/adobetv.py b/youtube_dl/extractor/adobetv.py index 80060f037..7dc81f629 100644 --- a/youtube_dl/extractor/adobetv.py +++ b/youtube_dl/extractor/adobetv.py @@ -6,10 +6,10 @@ import re from .common import InfoExtractor from ..compat import compat_str from ..utils import ( - float_or_none, - int_or_none, ISO639Utils, OnDemandPagedList, + float_or_none, + int_or_none, parse_duration, str_or_none, str_to_int, diff --git a/youtube_dl/extractor/afreecatv.py b/youtube_dl/extractor/afreecatv.py index b56abb1e6..0e0694af0 100644 --- a/youtube_dl/extractor/afreecatv.py +++ b/youtube_dl/extractor/afreecatv.py @@ -6,8 +6,8 @@ import re from .common import InfoExtractor from ..compat import compat_xpath from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, url_or_none, urlencode_postdata, diff --git a/youtube_dl/extractor/airmozilla.py b/youtube_dl/extractor/airmozilla.py index 9e38136b4..483bcb6e6 100644 --- a/youtube_dl/extractor/airmozilla.py +++ b/youtube_dl/extractor/airmozilla.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - parse_iso8601, -) +from ..utils import int_or_none, parse_duration, parse_iso8601 class AirMozillaIE(InfoExtractor): diff --git a/youtube_dl/extractor/aliexpress.py b/youtube_dl/extractor/aliexpress.py index 9722fe9ac..ad1341f3e 100644 --- a/youtube_dl/extractor/aliexpress.py +++ b/youtube_dl/extractor/aliexpress.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - float_or_none, - try_get, -) +from ..utils import float_or_none, try_get class AliExpressLiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/alphaporno.py b/youtube_dl/extractor/alphaporno.py index 3a6d99f6b..87f936a4e 100644 --- a/youtube_dl/extractor/alphaporno.py +++ b/youtube_dl/extractor/alphaporno.py @@ -1,12 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - parse_iso8601, - parse_duration, - parse_filesize, - int_or_none, -) +from ..utils import int_or_none, parse_duration, parse_filesize, parse_iso8601 class AlphaPornoIE(InfoExtractor): diff --git a/youtube_dl/extractor/amara.py b/youtube_dl/extractor/amara.py index 61d469574..d7216914a 100644 --- a/youtube_dl/extractor/amara.py +++ b/youtube_dl/extractor/amara.py @@ -2,13 +2,9 @@ from __future__ import unicode_literals from .common import InfoExtractor -from .youtube import YoutubeIE from .vimeo import VimeoIE -from ..utils import ( - int_or_none, - parse_iso8601, - update_url_query, -) +from .youtube import YoutubeIE +from ..utils import int_or_none, parse_iso8601, update_url_query class AmaraIE(InfoExtractor): diff --git a/youtube_dl/extractor/amcnetworks.py b/youtube_dl/extractor/amcnetworks.py index b8027bbca..bf48f8070 100644 --- a/youtube_dl/extractor/amcnetworks.py +++ b/youtube_dl/extractor/amcnetworks.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .theplatform import ThePlatformIE -from ..utils import ( - int_or_none, - parse_age_limit, - try_get, - update_url_query, -) +from ..utils import int_or_none, parse_age_limit, try_get, update_url_query class AMCNetworksIE(ThePlatformIE): diff --git a/youtube_dl/extractor/amp.py b/youtube_dl/extractor/amp.py index 24c684cad..226c04dbe 100644 --- a/youtube_dl/extractor/amp.py +++ b/youtube_dl/extractor/amp.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, mimetype2ext, parse_iso8601, diff --git a/youtube_dl/extractor/animeondemand.py b/youtube_dl/extractor/animeondemand.py index 54e097d2f..cf7149cce 100644 --- a/youtube_dl/extractor/animeondemand.py +++ b/youtube_dl/extractor/animeondemand.py @@ -5,9 +5,9 @@ import re from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + ExtractorError, determine_ext, extract_attributes, - ExtractorError, url_or_none, urlencode_postdata, urljoin, diff --git a/youtube_dl/extractor/anvato.py b/youtube_dl/extractor/anvato.py index b7398563b..ddd83dc03 100644 --- a/youtube_dl/extractor/anvato.py +++ b/youtube_dl/extractor/anvato.py @@ -14,8 +14,8 @@ from ..compat import compat_str from ..utils import ( bytes_to_intlist, determine_ext, - intlist_to_bytes, int_or_none, + intlist_to_bytes, strip_jsonp, unescapeHTML, unsmuggle_url, diff --git a/youtube_dl/extractor/aol.py b/youtube_dl/extractor/aol.py index f6ecb8438..73db3c91f 100644 --- a/youtube_dl/extractor/aol.py +++ b/youtube_dl/extractor/aol.py @@ -4,15 +4,8 @@ from __future__ import unicode_literals import re from .yahoo import YahooIE -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) -from ..utils import ( - ExtractorError, - int_or_none, - url_or_none, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse +from ..utils import ExtractorError, int_or_none, url_or_none class AolIE(YahooIE): diff --git a/youtube_dl/extractor/apa.py b/youtube_dl/extractor/apa.py index cbc1c0ecb..b2ced7cd1 100644 --- a/youtube_dl/extractor/apa.py +++ b/youtube_dl/extractor/apa.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - url_or_none, -) +from ..utils import determine_ext, int_or_none, url_or_none class APAIE(InfoExtractor): diff --git a/youtube_dl/extractor/appleconnect.py b/youtube_dl/extractor/appleconnect.py index 494f8330c..4c1a9bb92 100644 --- a/youtube_dl/extractor/appleconnect.py +++ b/youtube_dl/extractor/appleconnect.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - str_to_int, - ExtractorError -) +from ..utils import ExtractorError, str_to_int class AppleConnectIE(InfoExtractor): diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dl/extractor/appletrailers.py index a9ef733e0..ccf4ff0c6 100644 --- a/youtube_dl/extractor/appletrailers.py +++ b/youtube_dl/extractor/appletrailers.py @@ -1,15 +1,11 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - parse_duration, - unified_strdate, -) +from ..utils import int_or_none, parse_duration, unified_strdate class AppleTrailersIE(InfoExtractor): diff --git a/youtube_dl/extractor/arcpublishing.py b/youtube_dl/extractor/arcpublishing.py index ca6a6c4d8..a6481823d 100644 --- a/youtube_dl/extractor/arcpublishing.py +++ b/youtube_dl/extractor/arcpublishing.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - extract_attributes, - int_or_none, - parse_iso8601, - try_get, -) +from ..utils import extract_attributes, int_or_none, parse_iso8601, try_get class ArcPublishingIE(InfoExtractor): diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index a5b1f54d5..74a9b96f0 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -6,9 +6,10 @@ import re from .common import InfoExtractor from .generic import GenericIE +from ..compat import compat_etree_fromstring from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, parse_duration, qualities, @@ -20,7 +21,6 @@ from ..utils import ( url_or_none, xpath_text, ) -from ..compat import compat_etree_fromstring class ARDMediathekBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/arnes.py b/youtube_dl/extractor/arnes.py index c0032fcab..544cd822b 100644 --- a/youtube_dl/extractor/arnes.py +++ b/youtube_dl/extractor/arnes.py @@ -2,16 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) -from ..utils import ( - float_or_none, - int_or_none, - parse_iso8601, - remove_start, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse +from ..utils import float_or_none, int_or_none, parse_iso8601, remove_start class ArnesIE(InfoExtractor): diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py index 5bfe57b10..f27d72521 100644 --- a/youtube_dl/extractor/arte.py +++ b/youtube_dl/extractor/arte.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( ExtractorError, int_or_none, diff --git a/youtube_dl/extractor/asiancrush.py b/youtube_dl/extractor/asiancrush.py index 66ce7c686..c02bd7e8a 100644 --- a/youtube_dl/extractor/asiancrush.py +++ b/youtube_dl/extractor/asiancrush.py @@ -7,9 +7,9 @@ import re from .common import InfoExtractor from .kaltura import KalturaIE from ..utils import ( + OnDemandPagedList, extract_attributes, int_or_none, - OnDemandPagedList, parse_age_limit, strip_or_none, try_get, diff --git a/youtube_dl/extractor/atresplayer.py b/youtube_dl/extractor/atresplayer.py index c2cec9845..f72e2517e 100644 --- a/youtube_dl/extractor/atresplayer.py +++ b/youtube_dl/extractor/atresplayer.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - ExtractorError, - int_or_none, - urlencode_postdata, -) +from ..utils import ExtractorError, int_or_none, urlencode_postdata class AtresPlayerIE(InfoExtractor): diff --git a/youtube_dl/extractor/atvat.py b/youtube_dl/extractor/atvat.py index 95e572d70..8f0c16e34 100644 --- a/youtube_dl/extractor/atvat.py +++ b/youtube_dl/extractor/atvat.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - unescapeHTML, -) +from ..utils import determine_ext, int_or_none, unescapeHTML class ATVAtIE(InfoExtractor): diff --git a/youtube_dl/extractor/audimedia.py b/youtube_dl/extractor/audimedia.py index 6bd48ef15..b43d88b65 100644 --- a/youtube_dl/extractor/audimedia.py +++ b/youtube_dl/extractor/audimedia.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) +from ..utils import int_or_none, parse_iso8601 class AudiMediaIE(InfoExtractor): diff --git a/youtube_dl/extractor/audioboom.py b/youtube_dl/extractor/audioboom.py index c51837b40..8b26f1a27 100644 --- a/youtube_dl/extractor/audioboom.py +++ b/youtube_dl/extractor/audioboom.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - clean_html, - float_or_none, -) +from ..utils import clean_html, float_or_none class AudioBoomIE(InfoExtractor): diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dl/extractor/audiomack.py index 4d1fbad1f..ed8ceddb1 100644 --- a/youtube_dl/extractor/audiomack.py +++ b/youtube_dl/extractor/audiomack.py @@ -7,10 +7,7 @@ import time from .common import InfoExtractor from .soundcloud import SoundcloudIE from ..compat import compat_str -from ..utils import ( - ExtractorError, - url_basename, -) +from ..utils import ExtractorError, url_basename class AudiomackIE(InfoExtractor): diff --git a/youtube_dl/extractor/awaan.py b/youtube_dl/extractor/awaan.py index 3a7700cd4..76b359b09 100644 --- a/youtube_dl/extractor/awaan.py +++ b/youtube_dl/extractor/awaan.py @@ -1,14 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -import re import base64 +import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_str, -) +from ..compat import compat_str, compat_urllib_parse_urlencode from ..utils import ( int_or_none, parse_iso8601, diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py index 006aab3b4..ca0947b89 100644 --- a/youtube_dl/extractor/bandcamp.py +++ b/youtube_dl/extractor/bandcamp.py @@ -8,16 +8,16 @@ import time from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + KNOWN_EXTENSIONS, ExtractorError, float_or_none, int_or_none, - KNOWN_EXTENSIONS, parse_filesize, str_or_none, try_get, - update_url_query, unified_strdate, unified_timestamp, + update_url_query, url_or_none, urljoin, ) diff --git a/youtube_dl/extractor/beeg.py b/youtube_dl/extractor/beeg.py index 5788d13ba..f696cd92b 100644 --- a/youtube_dl/extractor/beeg.py +++ b/youtube_dl/extractor/beeg.py @@ -1,14 +1,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) -from ..utils import ( - int_or_none, - unified_timestamp, -) +from ..compat import compat_str, compat_urlparse +from ..utils import int_or_none, unified_timestamp class BeegIE(InfoExtractor): diff --git a/youtube_dl/extractor/bigflix.py b/youtube_dl/extractor/bigflix.py index 28e3e59f6..d5c8b8103 100644 --- a/youtube_dl/extractor/bigflix.py +++ b/youtube_dl/extractor/bigflix.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_urllib_parse_unquote, -) +from ..compat import compat_b64decode, compat_urllib_parse_unquote class BigflixIE(InfoExtractor): diff --git a/youtube_dl/extractor/bild.py b/youtube_dl/extractor/bild.py index b8dfbd42b..0da175f1f 100644 --- a/youtube_dl/extractor/bild.py +++ b/youtube_dl/extractor/bild.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - unescapeHTML, -) +from ..utils import int_or_none, unescapeHTML class BildIE(InfoExtractor): diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index d42f0e98a..bf8c30ef7 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -5,14 +5,11 @@ import hashlib import re from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) +from ..compat import compat_parse_qs, compat_urlparse from ..utils import ( ExtractorError, - int_or_none, float_or_none, + int_or_none, parse_iso8601, smuggle_url, str_or_none, diff --git a/youtube_dl/extractor/biobiochiletv.py b/youtube_dl/extractor/biobiochiletv.py index dc86c57c5..903577772 100644 --- a/youtube_dl/extractor/biobiochiletv.py +++ b/youtube_dl/extractor/biobiochiletv.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - remove_end, -) +from ..utils import ExtractorError, remove_end class BioBioChileTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/biqle.py b/youtube_dl/extractor/biqle.py index 17ebbb257..6542b1fba 100644 --- a/youtube_dl/extractor/biqle.py +++ b/youtube_dl/extractor/biqle.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from .vk import VKIE -from ..compat import ( - compat_b64decode, - compat_urllib_parse_unquote, -) +from ..compat import compat_b64decode, compat_urllib_parse_unquote from ..utils import int_or_none diff --git a/youtube_dl/extractor/bitchute.py b/youtube_dl/extractor/bitchute.py index 0c773e66e..049552902 100644 --- a/youtube_dl/extractor/bitchute.py +++ b/youtube_dl/extractor/bitchute.py @@ -5,11 +5,7 @@ import itertools import re from .common import InfoExtractor -from ..utils import ( - orderedSet, - unified_strdate, - urlencode_postdata, -) +from ..utils import orderedSet, unified_strdate, urlencode_postdata class BitChuteIE(InfoExtractor): diff --git a/youtube_dl/extractor/bleacherreport.py b/youtube_dl/extractor/bleacherreport.py index d1bf8e829..7cc7e4bf2 100644 --- a/youtube_dl/extractor/bleacherreport.py +++ b/youtube_dl/extractor/bleacherreport.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from .amp import AMPIE -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) +from .common import InfoExtractor +from ..utils import ExtractorError, int_or_none, parse_iso8601 class BleacherReportIE(InfoExtractor): diff --git a/youtube_dl/extractor/bongacams.py b/youtube_dl/extractor/bongacams.py index 016999d55..03c96b911 100644 --- a/youtube_dl/extractor/bongacams.py +++ b/youtube_dl/extractor/bongacams.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - try_get, - urlencode_postdata, -) +from ..utils import int_or_none, try_get, urlencode_postdata class BongaCamsIE(InfoExtractor): diff --git a/youtube_dl/extractor/bostonglobe.py b/youtube_dl/extractor/bostonglobe.py index 57882fbee..fa16f4c8a 100644 --- a/youtube_dl/extractor/bostonglobe.py +++ b/youtube_dl/extractor/bostonglobe.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor - -from ..utils import ( - extract_attributes, -) +from ..utils import extract_attributes class BostonGlobeIE(InfoExtractor): diff --git a/youtube_dl/extractor/box.py b/youtube_dl/extractor/box.py index aae82d1af..3f3589688 100644 --- a/youtube_dl/extractor/box.py +++ b/youtube_dl/extractor/box.py @@ -5,12 +5,7 @@ import json import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - parse_iso8601, - # try_get, - update_url_query, -) +from ..utils import determine_ext, parse_iso8601, update_url_query # try_get, class BoxIE(InfoExtractor): diff --git a/youtube_dl/extractor/bpb.py b/youtube_dl/extractor/bpb.py index 07833532e..293c48a25 100644 --- a/youtube_dl/extractor/bpb.py +++ b/youtube_dl/extractor/bpb.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - js_to_json, - determine_ext, -) +from ..utils import determine_ext, js_to_json class BpbIE(InfoExtractor): diff --git a/youtube_dl/extractor/br.py b/youtube_dl/extractor/br.py index 9bde7f2d8..3f843c620 100644 --- a/youtube_dl/extractor/br.py +++ b/youtube_dl/extractor/br.py @@ -6,8 +6,8 @@ import re from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, parse_duration, parse_iso8601, diff --git a/youtube_dl/extractor/bravotv.py b/youtube_dl/extractor/bravotv.py index bae2aedce..86fee9f94 100644 --- a/youtube_dl/extractor/bravotv.py +++ b/youtube_dl/extractor/bravotv.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .adobepass import AdobePassIE -from ..utils import ( - smuggle_url, - update_url_query, - int_or_none, -) +from ..utils import int_or_none, smuggle_url, update_url_query class BravoTVIE(AdobePassIE): diff --git a/youtube_dl/extractor/breakcom.py b/youtube_dl/extractor/breakcom.py index 68c7cf2bb..0b3285365 100644 --- a/youtube_dl/extractor/breakcom.py +++ b/youtube_dl/extractor/breakcom.py @@ -4,10 +4,7 @@ import re from .common import InfoExtractor from .youtube import YoutubeIE -from ..utils import ( - int_or_none, - url_or_none, -) +from ..utils import int_or_none, url_or_none class BreakIE(InfoExtractor): diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py index 6022076ac..30f9c0abd 100644 --- a/youtube_dl/extractor/brightcove.py +++ b/youtube_dl/extractor/brightcove.py @@ -16,9 +16,10 @@ from ..compat import ( compat_xml_parse_error, ) from ..utils import ( + ExtractorError, + UnsupportedError, clean_html, extract_attributes, - ExtractorError, find_xpath_attr, fix_xml_ampersands, float_or_none, @@ -31,7 +32,6 @@ from ..utils import ( try_get, unescapeHTML, unsmuggle_url, - UnsupportedError, update_url_query, url_or_none, ) diff --git a/youtube_dl/extractor/byutv.py b/youtube_dl/extractor/byutv.py index 0b11bf11f..5f28de5f3 100644 --- a/youtube_dl/extractor/byutv.py +++ b/youtube_dl/extractor/byutv.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - merge_dicts, - parse_duration, - url_or_none, -) +from ..utils import determine_ext, merge_dicts, parse_duration, url_or_none class BYUtvIE(InfoExtractor): diff --git a/youtube_dl/extractor/camdemy.py b/youtube_dl/extractor/camdemy.py index 8f0c6c545..61d46d08e 100644 --- a/youtube_dl/extractor/camdemy.py +++ b/youtube_dl/extractor/camdemy.py @@ -4,16 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_urlparse, -) -from ..utils import ( - clean_html, - parse_duration, - str_to_int, - unified_strdate, -) +from ..compat import compat_urllib_parse_urlencode, compat_urlparse +from ..utils import clean_html, parse_duration, str_to_int, unified_strdate class CamdemyIE(InfoExtractor): diff --git a/youtube_dl/extractor/cammodels.py b/youtube_dl/extractor/cammodels.py index 1eb81b75e..a390235bd 100644 --- a/youtube_dl/extractor/cammodels.py +++ b/youtube_dl/extractor/cammodels.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - url_or_none, -) +from ..utils import ExtractorError, int_or_none, url_or_none class CamModelsIE(InfoExtractor): diff --git a/youtube_dl/extractor/camtube.py b/youtube_dl/extractor/camtube.py index b3be3bdcf..97303dbb6 100644 --- a/youtube_dl/extractor/camtube.py +++ b/youtube_dl/extractor/camtube.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_timestamp, -) +from ..utils import int_or_none, unified_timestamp class CamTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/camwithher.py b/youtube_dl/extractor/camwithher.py index bbc5205fd..55c01bfa2 100644 --- a/youtube_dl/extractor/camwithher.py +++ b/youtube_dl/extractor/camwithher.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - unified_strdate, -) +from ..utils import int_or_none, parse_duration, unified_strdate class CamWithHerIE(InfoExtractor): diff --git a/youtube_dl/extractor/canalplus.py b/youtube_dl/extractor/canalplus.py index 51c11cb7e..83049ae1d 100644 --- a/youtube_dl/extractor/canalplus.py +++ b/youtube_dl/extractor/canalplus.py @@ -4,9 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - # ExtractorError, - # HEADRequest, +from ..utils import ( # ExtractorError,; HEADRequest, int_or_none, qualities, unified_strdate, diff --git a/youtube_dl/extractor/canvas.py b/youtube_dl/extractor/canvas.py index eefbab241..5664ad969 100644 --- a/youtube_dl/extractor/canvas.py +++ b/youtube_dl/extractor/canvas.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor from .gigya import GigyaBaseIE diff --git a/youtube_dl/extractor/carambatv.py b/youtube_dl/extractor/carambatv.py index b57b86af7..4709827e2 100644 --- a/youtube_dl/extractor/carambatv.py +++ b/youtube_dl/extractor/carambatv.py @@ -2,14 +2,9 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import compat_str -from ..utils import ( - float_or_none, - int_or_none, - try_get, -) - from .videomore import VideomoreIE +from ..compat import compat_str +from ..utils import float_or_none, int_or_none, try_get class CarambaTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/cbc.py b/youtube_dl/extractor/cbc.py index fd5ec6033..9c537665d 100644 --- a/youtube_dl/extractor/cbc.py +++ b/youtube_dl/extractor/cbc.py @@ -7,25 +7,22 @@ import re from xml.sax.saxutils import escape from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_HTTPError, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( - js_to_json, - smuggle_url, - try_get, - xpath_text, - xpath_element, - xpath_with_ns, + ExtractorError, find_xpath_attr, + int_or_none, + js_to_json, orderedSet, + parse_age_limit, parse_duration, parse_iso8601, - parse_age_limit, + smuggle_url, strip_or_none, - int_or_none, - ExtractorError, + try_get, + xpath_element, + xpath_text, + xpath_with_ns, ) diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py index c79e55a75..7ee29957b 100644 --- a/youtube_dl/extractor/cbs.py +++ b/youtube_dl/extractor/cbs.py @@ -3,11 +3,11 @@ from __future__ import unicode_literals from .theplatform import ThePlatformFeedIE from ..utils import ( ExtractorError, - int_or_none, find_xpath_attr, + int_or_none, + update_url_query, xpath_element, xpath_text, - update_url_query, ) diff --git a/youtube_dl/extractor/cbslocal.py b/youtube_dl/extractor/cbslocal.py index 3b7e1a8b9..543fff1b0 100644 --- a/youtube_dl/extractor/cbslocal.py +++ b/youtube_dl/extractor/cbslocal.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals from .anvato import AnvatoIE from .sendtonews import SendtoNewsIE from ..compat import compat_urlparse -from ..utils import ( - parse_iso8601, - unified_timestamp, -) +from ..utils import parse_iso8601, unified_timestamp class CBSLocalIE(AnvatoIE): diff --git a/youtube_dl/extractor/cbsnews.py b/youtube_dl/extractor/cbsnews.py index 1285ed65e..03c5f0334 100644 --- a/youtube_dl/extractor/cbsnews.py +++ b/youtube_dl/extractor/cbsnews.py @@ -4,15 +4,10 @@ from __future__ import unicode_literals import re import zlib -from .common import InfoExtractor from .cbs import CBSIE -from ..compat import ( - compat_b64decode, - compat_urllib_parse_unquote, -) -from ..utils import ( - parse_duration, -) +from .common import InfoExtractor +from ..compat import compat_b64decode, compat_urllib_parse_unquote +from ..utils import parse_duration class CBSNewsEmbedIE(CBSIE): diff --git a/youtube_dl/extractor/cbssports.py b/youtube_dl/extractor/cbssports.py index a891c9a55..ac2c284f8 100644 --- a/youtube_dl/extractor/cbssports.py +++ b/youtube_dl/extractor/cbssports.py @@ -4,10 +4,7 @@ import re # from .cbs import CBSBaseIE from .common import InfoExtractor -from ..utils import ( - int_or_none, - try_get, -) +from ..utils import int_or_none, try_get # class CBSSportsEmbedIE(CBSBaseIE): diff --git a/youtube_dl/extractor/ccc.py b/youtube_dl/extractor/ccc.py index 36e6dff72..7d8402d1d 100644 --- a/youtube_dl/extractor/ccc.py +++ b/youtube_dl/extractor/ccc.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, - try_get, - url_or_none, -) +from ..utils import int_or_none, parse_iso8601, try_get, url_or_none class CCCIE(InfoExtractor): diff --git a/youtube_dl/extractor/cctv.py b/youtube_dl/extractor/cctv.py index c76f361c6..5923e7431 100644 --- a/youtube_dl/extractor/cctv.py +++ b/youtube_dl/extractor/cctv.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - float_or_none, - try_get, - unified_timestamp, -) +from ..utils import float_or_none, try_get, unified_timestamp class CCTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/cda.py b/youtube_dl/extractor/cda.py index e1b391937..427658825 100644 --- a/youtube_dl/extractor/cda.py +++ b/youtube_dl/extractor/cda.py @@ -5,11 +5,7 @@ import codecs import re from .common import InfoExtractor -from ..compat import ( - compat_chr, - compat_ord, - compat_urllib_parse_unquote, -) +from ..compat import compat_chr, compat_ord, compat_urllib_parse_unquote from ..utils import ( ExtractorError, float_or_none, diff --git a/youtube_dl/extractor/ceskatelevize.py b/youtube_dl/extractor/ceskatelevize.py index fe677d8e8..c5e50bd38 100644 --- a/youtube_dl/extractor/ceskatelevize.py +++ b/youtube_dl/extractor/ceskatelevize.py @@ -4,18 +4,15 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote, - compat_urllib_parse_urlparse, -) +from ..compat import compat_urllib_parse_unquote, compat_urllib_parse_urlparse from ..utils import ( + USER_AGENTS, ExtractorError, float_or_none, sanitized_Request, str_or_none, traverse_obj, urlencode_postdata, - USER_AGENTS, ) diff --git a/youtube_dl/extractor/channel9.py b/youtube_dl/extractor/channel9.py index 09cacf6d3..4b30aab64 100644 --- a/youtube_dl/extractor/channel9.py +++ b/youtube_dl/extractor/channel9.py @@ -4,8 +4,8 @@ import re from .common import InfoExtractor from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, parse_iso8601, qualities, diff --git a/youtube_dl/extractor/chaturbate.py b/youtube_dl/extractor/chaturbate.py index a459dcb8d..2e9d9662c 100644 --- a/youtube_dl/extractor/chaturbate.py +++ b/youtube_dl/extractor/chaturbate.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - lowercase_escape, - url_or_none, -) +from ..utils import ExtractorError, lowercase_escape, url_or_none class ChaturbateIE(InfoExtractor): diff --git a/youtube_dl/extractor/chilloutzone.py b/youtube_dl/extractor/chilloutzone.py index 5aac21299..f94c0d7b1 100644 --- a/youtube_dl/extractor/chilloutzone.py +++ b/youtube_dl/extractor/chilloutzone.py @@ -1,15 +1,12 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor from .youtube import YoutubeIE from ..compat import compat_b64decode -from ..utils import ( - clean_html, - ExtractorError -) +from ..utils import ExtractorError, clean_html class ChilloutzoneIE(InfoExtractor): diff --git a/youtube_dl/extractor/cinchcast.py b/youtube_dl/extractor/cinchcast.py index b861d54b0..1129d1f36 100644 --- a/youtube_dl/extractor/cinchcast.py +++ b/youtube_dl/extractor/cinchcast.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - unified_strdate, - xpath_text, -) +from ..utils import unified_strdate, xpath_text class CinchcastIE(InfoExtractor): diff --git a/youtube_dl/extractor/ciscolive.py b/youtube_dl/extractor/ciscolive.py index da404e4dc..a84dff57b 100644 --- a/youtube_dl/extractor/ciscolive.py +++ b/youtube_dl/extractor/ciscolive.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import itertools from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse from ..utils import ( clean_html, float_or_none, diff --git a/youtube_dl/extractor/cjsw.py b/youtube_dl/extractor/cjsw.py index 505bdbe16..1b2a26f38 100644 --- a/youtube_dl/extractor/cjsw.py +++ b/youtube_dl/extractor/cjsw.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - unescapeHTML, -) +from ..utils import determine_ext, unescapeHTML class CJSWIE(InfoExtractor): diff --git a/youtube_dl/extractor/cliphunter.py b/youtube_dl/extractor/cliphunter.py index f2ca7a337..7cc21efd4 100644 --- a/youtube_dl/extractor/cliphunter.py +++ b/youtube_dl/extractor/cliphunter.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - url_or_none, -) +from ..utils import int_or_none, url_or_none class CliphunterIE(InfoExtractor): diff --git a/youtube_dl/extractor/clippit.py b/youtube_dl/extractor/clippit.py index a1a7a774c..c2cdf120b 100644 --- a/youtube_dl/extractor/clippit.py +++ b/youtube_dl/extractor/clippit.py @@ -2,14 +2,11 @@ from __future__ import unicode_literals -from .common import InfoExtractor -from ..utils import ( - parse_iso8601, - qualities, -) - import re +from .common import InfoExtractor +from ..utils import parse_iso8601, qualities + class ClippitIE(InfoExtractor): diff --git a/youtube_dl/extractor/clipsyndicate.py b/youtube_dl/extractor/clipsyndicate.py index 6cdb42f5a..48e2eb90c 100644 --- a/youtube_dl/extractor/clipsyndicate.py +++ b/youtube_dl/extractor/clipsyndicate.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - find_xpath_attr, - fix_xml_ampersands -) +from ..utils import find_xpath_attr, fix_xml_ampersands class ClipsyndicateIE(InfoExtractor): diff --git a/youtube_dl/extractor/cloudy.py b/youtube_dl/extractor/cloudy.py index 85ca20ecc..fc41c90c9 100644 --- a/youtube_dl/extractor/cloudy.py +++ b/youtube_dl/extractor/cloudy.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - str_to_int, - unified_strdate, -) +from ..utils import str_to_int, unified_strdate class CloudyIE(InfoExtractor): diff --git a/youtube_dl/extractor/clubic.py b/youtube_dl/extractor/clubic.py index 98f9cb596..3d7ae4ee0 100644 --- a/youtube_dl/extractor/clubic.py +++ b/youtube_dl/extractor/clubic.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - clean_html, - qualities, -) +from ..utils import clean_html, qualities class ClubicIE(InfoExtractor): diff --git a/youtube_dl/extractor/clyp.py b/youtube_dl/extractor/clyp.py index 06d04de13..aba62ac90 100644 --- a/youtube_dl/extractor/clyp.py +++ b/youtube_dl/extractor/clyp.py @@ -1,14 +1,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) -from ..utils import ( - float_or_none, - unified_timestamp, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse +from ..utils import float_or_none, unified_timestamp class ClypIE(InfoExtractor): diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 1f33a1e06..fdcfd296a 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -5,6 +5,7 @@ import base64 import datetime import hashlib import json +import math import netrc import os import random @@ -13,7 +14,6 @@ import socket import ssl import sys import time -import math from ..compat import ( compat_cookiejar_Cookie, @@ -21,8 +21,8 @@ from ..compat import ( compat_etree_Element, compat_etree_fromstring, compat_getpass, - compat_integer_types, compat_http_client, + compat_integer_types, compat_os_name, compat_str, compat_urllib_error, @@ -32,12 +32,14 @@ from ..compat import ( compat_urlparse, compat_xml_parse_error, ) -from ..downloader.f4m import ( - get_base_url, - remove_encrypted_media, -) +from ..downloader.f4m import get_base_url, remove_encrypted_media from ..utils import ( + JSON_LD_RE, NO_DEFAULT, + ExtractorError, + GeoRestrictedError, + GeoUtils, + RegexNotFoundError, age_restricted, base_url, bug_reports_message, @@ -47,15 +49,11 @@ from ..utils import ( determine_protocol, dict_get, error_to_compat_str, - ExtractorError, extract_attributes, fix_xml_ampersands, float_or_none, - GeoRestrictedError, - GeoUtils, int_or_none, js_to_json, - JSON_LD_RE, mimetype2ext, orderedSet, parse_bitrate, @@ -64,9 +62,8 @@ from ..utils import ( parse_iso8601, parse_m3u8_attributes, parse_resolution, - RegexNotFoundError, - sanitized_Request, sanitize_filename, + sanitized_Request, str_or_none, str_to_int, strip_or_none, @@ -75,9 +72,9 @@ from ..utils import ( unified_timestamp, update_Request, update_url_query, - urljoin, url_basename, url_or_none, + urljoin, xpath_element, xpath_text, xpath_with_ns, diff --git a/youtube_dl/extractor/commonprotocols.py b/youtube_dl/extractor/commonprotocols.py index d98331a4e..89ad34af7 100644 --- a/youtube_dl/extractor/commonprotocols.py +++ b/youtube_dl/extractor/commonprotocols.py @@ -1,9 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_urlparse, -) +from ..compat import compat_urlparse class RtmpIE(InfoExtractor): diff --git a/youtube_dl/extractor/condenast.py b/youtube_dl/extractor/condenast.py index d5e77af32..24d45203a 100644 --- a/youtube_dl/extractor/condenast.py +++ b/youtube_dl/extractor/condenast.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, - compat_urlparse, -) +from ..compat import compat_urllib_parse_urlparse, compat_urlparse from ..utils import ( determine_ext, extract_attributes, diff --git a/youtube_dl/extractor/contv.py b/youtube_dl/extractor/contv.py index 84b462d40..9cd330476 100644 --- a/youtube_dl/extractor/contv.py +++ b/youtube_dl/extractor/contv.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, -) +from ..utils import float_or_none, int_or_none class CONtvIE(InfoExtractor): diff --git a/youtube_dl/extractor/corus.py b/youtube_dl/extractor/corus.py index e11aadf14..b339c0948 100644 --- a/youtube_dl/extractor/corus.py +++ b/youtube_dl/extractor/corus.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .theplatform import ThePlatformFeedIE -from ..utils import ( - dict_get, - ExtractorError, - float_or_none, - int_or_none, -) +from ..utils import ExtractorError, dict_get, float_or_none, int_or_none class CorusIE(ThePlatformFeedIE): diff --git a/youtube_dl/extractor/cracked.py b/youtube_dl/extractor/cracked.py index f77a68ece..cd27b2134 100644 --- a/youtube_dl/extractor/cracked.py +++ b/youtube_dl/extractor/cracked.py @@ -4,10 +4,7 @@ import re from .common import InfoExtractor from .youtube import YoutubeIE -from ..utils import ( - parse_iso8601, - str_to_int, -) +from ..utils import parse_iso8601, str_to_int class CrackedIE(InfoExtractor): diff --git a/youtube_dl/extractor/crackle.py b/youtube_dl/extractor/crackle.py index 49bf3a4f9..e1ae3db1b 100644 --- a/youtube_dl/extractor/crackle.py +++ b/youtube_dl/extractor/crackle.py @@ -1,5 +1,5 @@ # coding: utf-8 -from __future__ import unicode_literals, division +from __future__ import division, unicode_literals import hashlib import hmac @@ -9,13 +9,13 @@ import time from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( + ExtractorError, determine_ext, float_or_none, int_or_none, parse_age_limit, parse_duration, url_or_none, - ExtractorError ) diff --git a/youtube_dl/extractor/crooksandliars.py b/youtube_dl/extractor/crooksandliars.py index 7fb782db7..01baba73b 100644 --- a/youtube_dl/extractor/crooksandliars.py +++ b/youtube_dl/extractor/crooksandliars.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - qualities, -) +from ..utils import int_or_none, qualities class CrooksAndLiarsIE(InfoExtractor): diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py index bc2d1fa8b..01dfe21ad 100644 --- a/youtube_dl/extractor/crunchyroll.py +++ b/youtube_dl/extractor/crunchyroll.py @@ -1,14 +1,15 @@ # coding: utf-8 from __future__ import unicode_literals -import re import json +import re import zlib - from hashlib import sha1 -from math import pow, sqrt, floor +from math import floor, pow, sqrt + from .common import InfoExtractor from .vrv import VRVIE +from ..aes import aes_cbc_decrypt from ..compat import ( compat_b64decode, compat_etree_Element, @@ -23,8 +24,8 @@ from ..utils import ( bytes_to_intlist, extract_attributes, float_or_none, - intlist_to_bytes, int_or_none, + intlist_to_bytes, lowercase_escape, merge_dicts, remove_end, @@ -32,9 +33,6 @@ from ..utils import ( urlencode_postdata, xpath_text, ) -from ..aes import ( - aes_cbc_decrypt, -) class CrunchyrollBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py index 2e01aff48..137fb9584 100644 --- a/youtube_dl/extractor/cspan.py +++ b/youtube_dl/extractor/cspan.py @@ -3,9 +3,11 @@ from __future__ import unicode_literals import re from .common import InfoExtractor +from .senateisvp import SenateISVPIE +from .ustream import UstreamIE from ..utils import ( - determine_ext, ExtractorError, + determine_ext, extract_attributes, find_xpath_attr, get_element_by_attribute, @@ -18,8 +20,6 @@ from ..utils import ( str_to_int, unescapeHTML, ) -from .senateisvp import SenateISVPIE -from .ustream import UstreamIE class CSpanIE(InfoExtractor): diff --git a/youtube_dl/extractor/ctsnews.py b/youtube_dl/extractor/ctsnews.py index 679f1d92e..1292013a9 100644 --- a/youtube_dl/extractor/ctsnews.py +++ b/youtube_dl/extractor/ctsnews.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import unified_timestamp from .youtube import YoutubeIE +from ..utils import unified_timestamp class CtsNewsIE(InfoExtractor): diff --git a/youtube_dl/extractor/cultureunplugged.py b/youtube_dl/extractor/cultureunplugged.py index bcdf27323..466e0ee3a 100644 --- a/youtube_dl/extractor/cultureunplugged.py +++ b/youtube_dl/extractor/cultureunplugged.py @@ -4,10 +4,7 @@ import re import time from .common import InfoExtractor -from ..utils import ( - int_or_none, - HEADRequest, -) +from ..utils import HEADRequest, int_or_none class CultureUnpluggedIE(InfoExtractor): diff --git a/youtube_dl/extractor/curiositystream.py b/youtube_dl/extractor/curiositystream.py index 48ff30432..371bd2a4c 100644 --- a/youtube_dl/extractor/curiositystream.py +++ b/youtube_dl/extractor/curiositystream.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - urlencode_postdata, - compat_str, - ExtractorError, -) +from ..utils import ExtractorError, compat_str, int_or_none, urlencode_postdata class CuriosityStreamBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/dailymail.py b/youtube_dl/extractor/dailymail.py index 67b88fd56..95e9c05fe 100644 --- a/youtube_dl/extractor/dailymail.py +++ b/youtube_dl/extractor/dailymail.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - determine_protocol, - try_get, - unescapeHTML, -) +from ..utils import determine_protocol, int_or_none, try_get, unescapeHTML class DailyMailIE(InfoExtractor): diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index b8529050c..b1e9920b7 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -8,11 +8,11 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( + ExtractorError, + OnDemandPagedList, age_restricted, clean_html, - ExtractorError, int_or_none, - OnDemandPagedList, try_get, unescapeHTML, urlencode_postdata, diff --git a/youtube_dl/extractor/dctp.py b/youtube_dl/extractor/dctp.py index e700f8d86..09c53c406 100644 --- a/youtube_dl/extractor/dctp.py +++ b/youtube_dl/extractor/dctp.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - float_or_none, - int_or_none, - unified_timestamp, - url_or_none, -) +from ..utils import float_or_none, int_or_none, unified_timestamp, url_or_none class DctpTvIE(InfoExtractor): diff --git a/youtube_dl/extractor/deezer.py b/youtube_dl/extractor/deezer.py index a38b2683d..f5c49b3b4 100644 --- a/youtube_dl/extractor/deezer.py +++ b/youtube_dl/extractor/deezer.py @@ -4,11 +4,7 @@ import json import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - orderedSet, -) +from ..utils import ExtractorError, int_or_none, orderedSet class DeezerPlaylistIE(InfoExtractor): diff --git a/youtube_dl/extractor/democracynow.py b/youtube_dl/extractor/democracynow.py index 5c9c0ecdc..be1eb82ba 100644 --- a/youtube_dl/extractor/democracynow.py +++ b/youtube_dl/extractor/democracynow.py @@ -1,15 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import re import os.path +import re from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - url_basename, - remove_start, -) +from ..utils import remove_start, url_basename class DemocracynowIE(InfoExtractor): diff --git a/youtube_dl/extractor/discovery.py b/youtube_dl/extractor/discovery.py index e0139cc86..b513f2f80 100644 --- a/youtube_dl/extractor/discovery.py +++ b/youtube_dl/extractor/discovery.py @@ -5,9 +5,8 @@ import re import string from .discoverygo import DiscoveryGoBaseIE -from ..compat import compat_urllib_parse_unquote +from ..compat import compat_HTTPError, compat_urllib_parse_unquote from ..utils import ExtractorError -from ..compat import compat_HTTPError class DiscoveryIE(DiscoveryGoBaseIE): diff --git a/youtube_dl/extractor/discoverygo.py b/youtube_dl/extractor/discoverygo.py index 9e7b14a7d..6db78b554 100644 --- a/youtube_dl/extractor/discoverygo.py +++ b/youtube_dl/extractor/discoverygo.py @@ -4,9 +4,9 @@ import re from .common import InfoExtractor from ..utils import ( + ExtractorError, determine_ext, extract_attributes, - ExtractorError, int_or_none, parse_age_limit, remove_end, diff --git a/youtube_dl/extractor/disney.py b/youtube_dl/extractor/disney.py index 0eee82fd6..83b845612 100644 --- a/youtube_dl/extractor/disney.py +++ b/youtube_dl/extractor/disney.py @@ -5,11 +5,11 @@ import re from .common import InfoExtractor from ..utils import ( - int_or_none, - unified_strdate, + ExtractorError, compat_str, determine_ext, - ExtractorError, + int_or_none, + unified_strdate, update_url_query, ) diff --git a/youtube_dl/extractor/dotsub.py b/youtube_dl/extractor/dotsub.py index 148605c0b..c16d95fa6 100644 --- a/youtube_dl/extractor/dotsub.py +++ b/youtube_dl/extractor/dotsub.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, -) +from ..utils import float_or_none, int_or_none class DotsubIE(InfoExtractor): diff --git a/youtube_dl/extractor/douyutv.py b/youtube_dl/extractor/douyutv.py index 9757f4422..ac3e93bc0 100644 --- a/youtube_dl/extractor/douyutv.py +++ b/youtube_dl/extractor/douyutv.py @@ -1,17 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import time import hashlib import re +import time from .common import InfoExtractor -from ..utils import ( - ExtractorError, - unescapeHTML, - unified_strdate, - urljoin, -) +from ..utils import ExtractorError, unescapeHTML, unified_strdate, urljoin class DouyuTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/dplay.py b/youtube_dl/extractor/dplay.py index bbb199094..3ac300f93 100644 --- a/youtube_dl/extractor/dplay.py +++ b/youtube_dl/extractor/dplay.py @@ -7,8 +7,8 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( - determine_ext, ExtractorError, + determine_ext, float_or_none, int_or_none, strip_or_none, diff --git a/youtube_dl/extractor/drbonanza.py b/youtube_dl/extractor/drbonanza.py index 164e97c36..a051315c3 100644 --- a/youtube_dl/extractor/drbonanza.py +++ b/youtube_dl/extractor/drbonanza.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - js_to_json, - parse_duration, - unescapeHTML, -) +from ..utils import js_to_json, parse_duration, unescapeHTML class DRBonanzaIE(InfoExtractor): diff --git a/youtube_dl/extractor/drtuber.py b/youtube_dl/extractor/drtuber.py index 2baea585b..99e4ee3dd 100644 --- a/youtube_dl/extractor/drtuber.py +++ b/youtube_dl/extractor/drtuber.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - NO_DEFAULT, - parse_duration, - str_to_int, -) +from ..utils import NO_DEFAULT, int_or_none, parse_duration, str_to_int class DrTuberIE(InfoExtractor): diff --git a/youtube_dl/extractor/drtv.py b/youtube_dl/extractor/drtv.py index c0036adb6..638596015 100644 --- a/youtube_dl/extractor/drtv.py +++ b/youtube_dl/extractor/drtv.py @@ -5,16 +5,15 @@ import binascii import hashlib import re - from .common import InfoExtractor from ..aes import aes_cbc_decrypt from ..compat import compat_urllib_parse_unquote from ..utils import ( - bytes_to_intlist, ExtractorError, + bytes_to_intlist, + float_or_none, int_or_none, intlist_to_bytes, - float_or_none, mimetype2ext, str_or_none, try_get, diff --git a/youtube_dl/extractor/dtube.py b/youtube_dl/extractor/dtube.py index 114d2dbe3..62240b878 100644 --- a/youtube_dl/extractor/dtube.py +++ b/youtube_dl/extractor/dtube.py @@ -6,10 +6,7 @@ import re from socket import timeout from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) +from ..utils import int_or_none, parse_iso8601 class DTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index d9d9afdec..f56c03a1e 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - qualities, -) +from ..utils import int_or_none, qualities class DumpertIE(InfoExtractor): diff --git a/youtube_dl/extractor/dvtv.py b/youtube_dl/extractor/dvtv.py index de7f6d670..efbf35c84 100644 --- a/youtube_dl/extractor/dvtv.py +++ b/youtube_dl/extractor/dvtv.py @@ -5,14 +5,14 @@ import re from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, js_to_json, mimetype2ext, + parse_iso8601, try_get, unescapeHTML, - parse_iso8601, ) diff --git a/youtube_dl/extractor/dw.py b/youtube_dl/extractor/dw.py index d740652f1..cdc81baae 100644 --- a/youtube_dl/extractor/dw.py +++ b/youtube_dl/extractor/dw.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) from ..compat import compat_urlparse +from ..utils import int_or_none, unified_strdate class DWIE(InfoExtractor): diff --git a/youtube_dl/extractor/eagleplatform.py b/youtube_dl/extractor/eagleplatform.py index 36fef07b7..872551976 100644 --- a/youtube_dl/extractor/eagleplatform.py +++ b/youtube_dl/extractor/eagleplatform.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - ExtractorError, - int_or_none, - unsmuggle_url, - url_or_none, -) +from ..utils import ExtractorError, int_or_none, unsmuggle_url, url_or_none class EaglePlatformIE(InfoExtractor): diff --git a/youtube_dl/extractor/eighttracks.py b/youtube_dl/extractor/eighttracks.py index 9a44f89f3..7b2a842be 100644 --- a/youtube_dl/extractor/eighttracks.py +++ b/youtube_dl/extractor/eighttracks.py @@ -5,12 +5,8 @@ import json import random from .common import InfoExtractor -from ..compat import ( - compat_str, -) -from ..utils import ( - ExtractorError, -) +from ..compat import compat_str +from ..utils import ExtractorError class EightTracksIE(InfoExtractor): diff --git a/youtube_dl/extractor/einthusan.py b/youtube_dl/extractor/einthusan.py index 4e0f8bc81..8954a7290 100644 --- a/youtube_dl/extractor/einthusan.py +++ b/youtube_dl/extractor/einthusan.py @@ -5,14 +5,10 @@ import json import re from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_str, - compat_urlparse, -) +from ..compat import compat_b64decode, compat_str, compat_urlparse from ..utils import ( - extract_attributes, ExtractorError, + extract_attributes, get_elements_by_class, urlencode_postdata, ) diff --git a/youtube_dl/extractor/eitb.py b/youtube_dl/extractor/eitb.py index ee5ead18b..97678238d 100644 --- a/youtube_dl/extractor/eitb.py +++ b/youtube_dl/extractor/eitb.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, - parse_iso8601, - sanitized_Request, -) +from ..utils import float_or_none, int_or_none, parse_iso8601, sanitized_Request class EitbIE(InfoExtractor): diff --git a/youtube_dl/extractor/eporner.py b/youtube_dl/extractor/eporner.py index bfecd3a41..b5e42ddc9 100644 --- a/youtube_dl/extractor/eporner.py +++ b/youtube_dl/extractor/eporner.py @@ -5,8 +5,8 @@ import re from .common import InfoExtractor from ..utils import ( - encode_base_n, ExtractorError, + encode_base_n, int_or_none, merge_dicts, parse_duration, diff --git a/youtube_dl/extractor/eroprofile.py b/youtube_dl/extractor/eroprofile.py index c460dc7f9..6efcc07fc 100644 --- a/youtube_dl/extractor/eroprofile.py +++ b/youtube_dl/extractor/eroprofile.py @@ -4,10 +4,7 @@ import re from .common import InfoExtractor from ..compat import compat_urllib_parse_urlencode -from ..utils import ( - ExtractorError, - merge_dicts, -) +from ..utils import ExtractorError, merge_dicts class EroProfileIE(InfoExtractor): diff --git a/youtube_dl/extractor/escapist.py b/youtube_dl/extractor/escapist.py index 4cd815ebc..92e4d4336 100644 --- a/youtube_dl/extractor/escapist.py +++ b/youtube_dl/extractor/escapist.py @@ -1,12 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - clean_html, - int_or_none, - float_or_none, -) +from ..utils import clean_html, determine_ext, float_or_none, int_or_none def _decrypt_config(key, string): diff --git a/youtube_dl/extractor/espn.py b/youtube_dl/extractor/espn.py index 6cf05e6da..8cac39645 100644 --- a/youtube_dl/extractor/espn.py +++ b/youtube_dl/extractor/espn.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from .once import OnceIE from ..compat import compat_str -from ..utils import ( - determine_ext, - int_or_none, - unified_timestamp, -) +from ..utils import determine_ext, int_or_none, unified_timestamp class ESPNIE(OnceIE): diff --git a/youtube_dl/extractor/esri.py b/youtube_dl/extractor/esri.py index e9dcaeb1d..35fd6cfd3 100644 --- a/youtube_dl/extractor/esri.py +++ b/youtube_dl/extractor/esri.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - parse_filesize, - unified_strdate, -) +from ..utils import int_or_none, parse_filesize, unified_strdate class EsriVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/europa.py b/youtube_dl/extractor/europa.py index 2c1c747a1..92003af74 100644 --- a/youtube_dl/extractor/europa.py +++ b/youtube_dl/extractor/europa.py @@ -9,7 +9,7 @@ from ..utils import ( parse_duration, qualities, unified_strdate, - xpath_text + xpath_text, ) diff --git a/youtube_dl/extractor/expotv.py b/youtube_dl/extractor/expotv.py index 95a897782..92b9943ca 100644 --- a/youtube_dl/extractor/expotv.py +++ b/youtube_dl/extractor/expotv.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) +from ..utils import int_or_none, unified_strdate class ExpoTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/expressen.py b/youtube_dl/extractor/expressen.py index dc8b855d2..6cd93083c 100644 --- a/youtube_dl/extractor/expressen.py +++ b/youtube_dl/extractor/expressen.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - unescapeHTML, - unified_timestamp, -) +from ..utils import determine_ext, int_or_none, unescapeHTML, unified_timestamp class ExpressenIE(InfoExtractor): diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index e36f86be4..efb1aa353 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -1,45 +1,54 @@ # flake8: noqa from __future__ import unicode_literals -from .abc import ( - ABCIE, - ABCIViewIE, -) -from .abcnews import ( - AbcNewsIE, - AbcNewsVideoIE, -) -from .abcotvs import ( - ABCOTVSIE, - ABCOTVSClipsIE, +# Having this at top improves performance for most users +from .youtube import ( # isort: split + YoutubeFavouritesIE, + YoutubeHistoryIE, + YoutubeIE, + YoutubePlaylistIE, + YoutubeRecommendedIE, + YoutubeSearchDateIE, + YoutubeSearchIE, + YoutubeSearchURLIE, + YoutubeSubscriptionsIE, + YoutubeTabIE, + YoutubeTruncatedIDIE, + YoutubeTruncatedURLIE, + YoutubeWatchLaterIE, + YoutubeYtBeIE, + YoutubeYtUserIE, ) +from .abc import ABCIE, ABCIViewIE +from .abcnews import AbcNewsIE, AbcNewsVideoIE +from .abcotvs import ABCOTVSIE, ABCOTVSClipsIE from .academicearth import AcademicEarthCourseIE -from .acast import ( - ACastIE, - ACastChannelIE, -) +from .acast import ACastChannelIE, ACastIE from .adn import ADNIE from .adobeconnect import AdobeConnectIE from .adobetv import ( + AdobeTVChannelIE, AdobeTVEmbedIE, AdobeTVIE, AdobeTVShowIE, - AdobeTVChannelIE, AdobeTVVideoIE, ) from .adultswim import AdultSwimIE from .aenetworks import ( - AENetworksIE, AENetworksCollectionIE, + AENetworksIE, AENetworksShowIE, - HistoryTopicIE, - HistoryPlayerIE, BiographyIE, + HistoryPlayerIE, + HistoryTopicIE, ) from .afreecatv import AfreecaTVIE from .airmozilla import AirMozillaIE +from .aliexpress import AliExpressLiveIE from .aljazeera import AlJazeeraIE +from .allocine import AllocineIE from .alphaporno import AlphaPornoIE +from .alsace20tv import Alsace20TVEmbedIE, Alsace20TVIE from .amara import AmaraIE from .amcnetworks import AMCNetworksIE from .americastestkitchen import ( @@ -49,162 +58,89 @@ from .americastestkitchen import ( from .animeondemand import AnimeOnDemandIE from .anvato import AnvatoIE from .aol import AolIE -from .allocine import AllocineIE -from .aliexpress import AliExpressLiveIE -from .alsace20tv import ( - Alsace20TVIE, - Alsace20TVEmbedIE, -) from .apa import APAIE from .aparat import AparatIE from .appleconnect import AppleConnectIE -from .appletrailers import ( - AppleTrailersIE, - AppleTrailersSectionIE, -) from .applepodcasts import ApplePodcastsIE +from .appletrailers import AppleTrailersIE, AppleTrailersSectionIE from .archiveorg import ArchiveOrgIE from .arcpublishing import ArcPublishingIE +from .ard import ARDIE, ARDBetaMediathekIE, ARDMediathekIE from .arkena import ArkenaIE -from .ard import ( - ARDBetaMediathekIE, - ARDIE, - ARDMediathekIE, -) -from .arte import ( - ArteTVIE, - ArteTVEmbedIE, - ArteTVPlaylistIE, - ArteTVCategoryIE, -) from .arnes import ArnesIE -from .asiancrush import ( - AsianCrushIE, - AsianCrushPlaylistIE, -) +from .arte import ArteTVCategoryIE, ArteTVEmbedIE, ArteTVIE, ArteTVPlaylistIE +from .asiancrush import AsianCrushIE, AsianCrushPlaylistIE from .atresplayer import AtresPlayerIE from .atttechchannel import ATTTechChannelIE from .atvat import ATVAtIE from .audimedia import AudiMediaIE from .audioboom import AudioBoomIE -from .audiomack import AudiomackIE, AudiomackAlbumIE -from .awaan import ( - AWAANIE, - AWAANVideoIE, - AWAANLiveIE, - AWAANSeasonIE, -) +from .audiomack import AudiomackAlbumIE, AudiomackIE +from .awaan import AWAANIE, AWAANLiveIE, AWAANSeasonIE, AWAANVideoIE from .azmedien import AZMedienIE from .baidu import BaiduVideoIE from .bandaichannel import BandaiChannelIE -from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE +from .bandcamp import BandcampAlbumIE, BandcampIE, BandcampWeeklyIE from .bbc import ( - BBCCoUkIE, + BBCIE, BBCCoUkArticleIE, + BBCCoUkIE, BBCCoUkIPlayerEpisodesIE, BBCCoUkIPlayerGroupIE, BBCCoUkPlaylistIE, - BBCIE, ) +from .beatport import BeatportIE from .beeg import BeegIE from .behindkink import BehindKinkIE from .bellmedia import BellMediaIE -from .beatport import BeatportIE from .bet import BetIE from .bfi import BFIPlayerIE -from .bfmtv import ( - BFMTVIE, - BFMTVLiveIE, - BFMTVArticleIE, -) +from .bfmtv import BFMTVIE, BFMTVArticleIE, BFMTVLiveIE from .bibeltv import BibelTVIE from .bigflix import BigflixIE from .bigo import BigoIE from .bild import BildIE from .bilibili import ( - BiliBiliIE, - BiliBiliBangumiIE, - BilibiliAudioIE, BilibiliAudioAlbumIE, + BilibiliAudioIE, + BiliBiliBangumiIE, + BiliBiliIE, BiliBiliPlayerIE, ) from .biobiochiletv import BioBioChileTVIE -from .bitchute import ( - BitChuteIE, - BitChuteChannelIE, -) from .biqle import BIQLEIE -from .bleacherreport import ( - BleacherReportIE, - BleacherReportCMSIE, -) +from .bitchute import BitChuteChannelIE, BitChuteIE +from .bleacherreport import BleacherReportCMSIE, BleacherReportIE from .bloomberg import BloombergIE from .bokecc import BokeCCIE from .bongacams import BongaCamsIE from .bostonglobe import BostonGlobeIE from .box import BoxIE from .bpb import BpbIE -from .br import ( - BRIE, - BRMediathekIE, -) +from .br import BRIE, BRMediathekIE from .bravotv import BravoTVIE from .breakcom import BreakIE -from .brightcove import ( - BrightcoveLegacyIE, - BrightcoveNewIE, -) +from .brightcove import BrightcoveLegacyIE, BrightcoveNewIE from .businessinsider import BusinessInsiderIE from .buzzfeed import BuzzFeedIE from .byutv import BYUtvIE from .c56 import C56IE -from .camdemy import ( - CamdemyIE, - CamdemyFolderIE -) +from .camdemy import CamdemyFolderIE, CamdemyIE from .cammodels import CamModelsIE from .camtube import CamTubeIE from .camwithher import CamWithHerIE -from .canalplus import CanalplusIE from .canalc2 import Canalc2IE -from .canvas import ( - CanvasIE, - CanvasEenIE, - VrtNUIE, - DagelijkseKostIE, -) -from .carambatv import ( - CarambaTVIE, - CarambaTVPageIE, -) +from .canalplus import CanalplusIE +from .canvas import CanvasEenIE, CanvasIE, DagelijkseKostIE, VrtNUIE +from .carambatv import CarambaTVIE, CarambaTVPageIE from .cartoonnetwork import CartoonNetworkIE -from .cbc import ( - CBCIE, - CBCPlayerIE, - CBCWatchVideoIE, - CBCWatchIE, - CBCOlympicsIE, -) +from .cbc import CBCIE, CBCOlympicsIE, CBCPlayerIE, CBCWatchIE, CBCWatchVideoIE from .cbs import CBSIE -from .cbslocal import ( - CBSLocalIE, - CBSLocalArticleIE, -) from .cbsinteractive import CBSInteractiveIE -from .cbsnews import ( - CBSNewsEmbedIE, - CBSNewsIE, - CBSNewsLiveVideoIE, -) -from .cbssports import ( - CBSSportsEmbedIE, - CBSSportsIE, - TwentyFourSevenSportsIE, -) -from .ccc import ( - CCCIE, - CCCPlaylistIE, -) +from .cbslocal import CBSLocalArticleIE, CBSLocalIE +from .cbsnews import CBSNewsEmbedIE, CBSNewsIE, CBSNewsLiveVideoIE +from .cbssports import CBSSportsEmbedIE, CBSSportsIE, TwentyFourSevenSportsIE +from .ccc import CCCIE, CCCPlaylistIE from .ccma import CCMAIE from .cctv import CCTVIE from .cda import CDAIE @@ -213,16 +149,10 @@ from .channel9 import Channel9IE from .charlierose import CharlieRoseIE from .chaturbate import ChaturbateIE from .chilloutzone import ChilloutzoneIE -from .chirbit import ( - ChirbitIE, - ChirbitProfileIE, -) +from .chirbit import ChirbitIE, ChirbitProfileIE from .cinchcast import CinchcastIE from .cinemax import CinemaxIE -from .ciscolive import ( - CiscoLiveSessionIE, - CiscoLiveSearchIE, -) +from .ciscolive import CiscoLiveSearchIE, CiscoLiveSessionIE from .cjsw import CJSWIE from .cliphunter import CliphunterIE from .clippit import ClippitIE @@ -234,150 +164,85 @@ from .cloudy import CloudyIE from .clubic import ClubicIE from .clyp import ClypIE from .cmt import CMTIE -from .cnbc import ( - CNBCIE, - CNBCVideoIE, -) -from .cnn import ( - CNNIE, - CNNBlogsIE, - CNNArticleIE, -) -from .coub import CoubIE -from .comedycentral import ( - ComedyCentralIE, - ComedyCentralTVIE, -) +from .cnbc import CNBCIE, CNBCVideoIE +from .cnn import CNNIE, CNNArticleIE, CNNBlogsIE +from .comedycentral import ComedyCentralIE, ComedyCentralTVIE from .commonmistakes import CommonMistakesIE, UnicodeBOMIE -from .commonprotocols import ( - MmsIE, - RtmpIE, -) +from .commonprotocols import MmsIE, RtmpIE from .condenast import CondeNastIE from .contv import CONtvIE from .corus import CorusIE -from .cpac import ( - CPACIE, - CPACPlaylistIE, -) +from .coub import CoubIE +from .cpac import CPACIE, CPACPlaylistIE from .cracked import CrackedIE from .crackle import CrackleIE from .crooksandliars import CrooksAndLiarsIE -from .crunchyroll import ( - CrunchyrollIE, - CrunchyrollShowPlaylistIE -) +from .crunchyroll import CrunchyrollIE, CrunchyrollShowPlaylistIE from .cspan import CSpanIE from .ctsnews import CtsNewsIE from .ctv import CTVIE from .ctvnews import CTVNewsIE from .cultureunplugged import CultureUnpluggedIE -from .curiositystream import ( - CuriosityStreamIE, - CuriosityStreamCollectionIE, -) +from .curiositystream import CuriosityStreamCollectionIE, CuriosityStreamIE from .cwtv import CWTVIE from .dailymail import DailyMailIE -from .dailymotion import ( - DailymotionIE, - DailymotionPlaylistIE, - DailymotionUserIE, -) -from .daum import ( - DaumIE, - DaumClipIE, - DaumPlaylistIE, - DaumUserIE, -) +from .dailymotion import DailymotionIE, DailymotionPlaylistIE, DailymotionUserIE +from .daum import DaumClipIE, DaumIE, DaumPlaylistIE, DaumUserIE from .dbtv import DBTVIE from .dctp import DctpTvIE from .deezer import DeezerPlaylistIE +from .defense import DefenseGouvFrIE from .democracynow import DemocracynowIE from .dfb import DFBIE from .dhm import DHMIE from .digg import DiggIE -from .dotsub import DotsubIE -from .douyutv import ( - DouyuShowIE, - DouyuTVIE, -) -from .dplay import ( - DPlayIE, - DiscoveryPlusIE, - HGTVDeIE, -) -from .dreisat import DreiSatIE -from .drbonanza import DRBonanzaIE -from .drtuber import DrTuberIE -from .drtv import ( - DRTVIE, - DRTVLiveIE, -) -from .dtube import DTubeIE -from .dvtv import DVTVIE -from .dumpert import DumpertIE -from .defense import DefenseGouvFrIE +from .digiteka import DigitekaIE from .discovery import DiscoveryIE -from .discoverygo import ( - DiscoveryGoIE, - DiscoveryGoPlaylistIE, -) +from .discoverygo import DiscoveryGoIE, DiscoveryGoPlaylistIE from .discoverynetworks import DiscoveryNetworksDeIE from .discoveryvr import DiscoveryVRIE from .disney import DisneyIE from .dispeak import DigitallySpeakingIE +from .dlive import DLiveStreamIE, DLiveVODIE +from .dotsub import DotsubIE +from .douyutv import DouyuShowIE, DouyuTVIE +from .dplay import DiscoveryPlusIE, DPlayIE, HGTVDeIE +from .drbonanza import DRBonanzaIE +from .dreisat import DreiSatIE from .dropbox import DropboxIE -from .dw import ( - DWIE, - DWArticleIE, -) +from .drtuber import DrTuberIE +from .drtv import DRTVIE, DRTVLiveIE +from .dtube import DTubeIE +from .dumpert import DumpertIE +from .dvtv import DVTVIE +from .dw import DWIE, DWArticleIE from .eagleplatform import EaglePlatformIE from .ebaumsworld import EbaumsWorldIE from .echomsk import EchoMskIE -from .egghead import ( - EggheadCourseIE, - EggheadLessonIE, -) +from .egghead import EggheadCourseIE, EggheadLessonIE from .ehow import EHowIE from .eighttracks import EightTracksIE from .einthusan import EinthusanIE from .eitb import EitbIE -from .ellentube import ( - EllenTubeIE, - EllenTubeVideoIE, - EllenTubePlaylistIE, -) +from .ellentube import EllenTubeIE, EllenTubePlaylistIE, EllenTubeVideoIE from .elpais import ElPaisIE from .embedly import EmbedlyIE from .engadget import EngadgetIE from .eporner import EpornerIE from .eroprofile import EroProfileIE from .escapist import EscapistIE -from .espn import ( - ESPNIE, - ESPNArticleIE, - FiveThirtyEightIE, -) +from .espn import ESPNIE, ESPNArticleIE, FiveThirtyEightIE from .esri import EsriVideoIE from .europa import EuropaIE from .expotv import ExpoTVIE from .expressen import ExpressenIE from .extremetube import ExtremeTubeIE from .eyedotv import EyedoTVIE -from .facebook import ( - FacebookIE, - FacebookPluginsVideoIE, -) +from .facebook import FacebookIE, FacebookPluginsVideoIE from .faz import FazIE -from .fc2 import ( - FC2IE, - FC2EmbedIE, -) +from .fc2 import FC2IE, FC2EmbedIE from .fczenit import FczenitIE -from .filmon import ( - FilmOnIE, - FilmOnChannelIE, -) +from .filmon import FilmOnChannelIE, FilmOnIE from .filmweb import FilmwebIE from .firsttv import FirstTVIE from .fivemin import FiveMinIE @@ -386,42 +251,31 @@ from .flickr import FlickrIE from .folketinget import FolketingetIE from .footyroom import FootyRoomIE from .formula1 import Formula1IE -from .fourtube import ( - FourTubeIE, - PornTubeIE, - PornerBrosIE, - FuxIE, -) +from .fourtube import FourTubeIE, FuxIE, PornerBrosIE, PornTubeIE from .fox import FOXIE -from .fox9 import ( - FOX9IE, - FOX9NewsIE, -) +from .fox9 import FOX9IE, FOX9NewsIE from .foxgay import FoxgayIE -from .foxnews import ( - FoxNewsIE, - FoxNewsArticleIE, -) +from .foxnews import FoxNewsArticleIE, FoxNewsIE from .foxsports import FoxSportsIE from .franceculture import FranceCultureIE from .franceinter import FranceInterIE from .francetv import ( - FranceTVIE, - FranceTVSiteIE, + CultureboxIE, FranceTVEmbedIE, + FranceTVIE, FranceTVInfoIE, FranceTVInfoSportIE, FranceTVJeunesseIE, + FranceTVSiteIE, GenerationWhatIE, - CultureboxIE, ) from .freesound import FreesoundIE from .freespeech import FreespeechIE from .freshlive import FreshLiveIE from .frontendmasters import ( + FrontendMastersCourseIE, FrontendMastersIE, FrontendMastersLessonIE, - FrontendMastersCourseIE ) from .fujitv import FujiTVFODPlus7IE from .funimation import FunimationIE @@ -440,18 +294,12 @@ from .gfycat import GfycatIE from .giantbomb import GiantBombIE from .giga import GigaIE from .glide import GlideIE -from .globo import ( - GloboIE, - GloboArticleIE, -) +from .globo import GloboArticleIE, GloboIE from .go import GoIE from .godtube import GodTubeIE from .golem import GolemIE from .googledrive import GoogleDriveIE -from .googlepodcasts import ( - GooglePodcastsIE, - GooglePodcastsFeedIE, -) +from .googlepodcasts import GooglePodcastsFeedIE, GooglePodcastsIE from .googlesearch import GoogleSearchIE from .goshgay import GoshgayIE from .gputechconf import GPUTechConfIE @@ -463,81 +311,45 @@ from .hellporno import HellPornoIE from .helsinki import HelsinkiIE from .hentaistigma import HentaiStigmaIE from .hgtv import HGTVComShowIE -from .hketv import HKETVIE from .hidive import HiDiveIE from .historicfilms import HistoricFilmsIE from .hitbox import HitboxIE, HitboxLiveIE from .hitrecord import HitRecordIE +from .hketv import HKETVIE from .hornbunny import HornBunnyIE from .hotnewhiphop import HotNewHipHopIE -from .hotstar import ( - HotStarIE, - HotStarPlaylistIE, -) +from .hotstar import HotStarIE, HotStarPlaylistIE from .howcast import HowcastIE from .howstuffworks import HowStuffWorksIE from .hrfernsehen import HRFernsehenIE -from .hrti import ( - HRTiIE, - HRTiPlaylistIE, -) +from .hrti import HRTiIE, HRTiPlaylistIE from .huajiao import HuajiaoIE from .huffpost import HuffPostIE -from .hungama import ( - HungamaIE, - HungamaSongIE, -) +from .hungama import HungamaIE, HungamaSongIE from .hypem import HypemIE -from .ign import ( - IGNIE, - IGNVideoIE, - IGNArticleIE, -) -from .iheart import ( - IHeartRadioIE, - IHeartRadioPodcastIE, -) -from .imdb import ( - ImdbIE, - ImdbListIE -) -from .imgur import ( - ImgurIE, - ImgurAlbumIE, - ImgurGalleryIE, -) +from .ign import IGNIE, IGNArticleIE, IGNVideoIE +from .iheart import IHeartRadioIE, IHeartRadioPodcastIE +from .imdb import ImdbIE, ImdbListIE +from .imgur import ImgurAlbumIE, ImgurGalleryIE, ImgurIE from .ina import InaIE from .inc import IncIE from .indavideo import IndavideoEmbedIE from .infoq import InfoQIE -from .instagram import ( - InstagramIE, - InstagramUserIE, - InstagramTagIE, -) +from .instagram import InstagramIE, InstagramTagIE, InstagramUserIE from .internazionale import InternazionaleIE from .internetvideoarchive import InternetVideoArchiveIE from .iprima import IPrimaIE from .iqiyi import IqiyiIE from .ir90tv import Ir90TvIE -from .itv import ( - ITVIE, - ITVBTCCIE, -) -from .ivi import ( - IviIE, - IviCompilationIE -) +from .itv import ITVBTCCIE, ITVIE +from .ivi import IviCompilationIE, IviIE from .ivideon import IvideonIE from .iwara import IwaraIE from .izlesene import IzleseneIE -from .jamendo import ( - JamendoIE, - JamendoAlbumIE, -) +from .jamendo import JamendoAlbumIE, JamendoIE from .jeuxvideo import JeuxVideoIE -from .jove import JoveIE from .joj import JojIE +from .jove import JoveIE from .jwplatform import JWPlatformIE from .kakao import KakaoIE from .kaltura import KalturaIE @@ -546,10 +358,7 @@ from .karaoketv import KaraoketvIE from .karrierevideos import KarriereVideosIE from .keezmovies import KeezMoviesIE from .ketnet import KetnetIE -from .khanacademy import ( - KhanAcademyIE, - KhanAcademyUnitIE, -) +from .khanacademy import KhanAcademyIE, KhanAcademyUnitIE from .kickstarter import KickStarterIE from .kinja import KinjaEmbedIE from .kinopoisk import KinoPoiskIE @@ -559,63 +368,34 @@ from .kth import KTHIE from .ku6 import Ku6IE from .kusi import KUSIIE from .kuwo import ( - KuwoIE, KuwoAlbumIE, - KuwoChartIE, - KuwoSingerIE, KuwoCategoryIE, + KuwoChartIE, + KuwoIE, KuwoMvIE, + KuwoSingerIE, ) from .la7 import LA7IE -from .laola1tv import ( - Laola1TvEmbedIE, - Laola1TvIE, - EHFTVIE, - ITTFIE, -) -from .lbry import ( - LBRYIE, - LBRYChannelIE, -) +from .laola1tv import EHFTVIE, ITTFIE, Laola1TvEmbedIE, Laola1TvIE +from .lbry import LBRYIE, LBRYChannelIE from .lci import LCIIE -from .lcp import ( - LcpPlayIE, - LcpIE, -) +from .lcp import LcpIE, LcpPlayIE from .lecture2go import Lecture2GoIE -from .lecturio import ( - LecturioIE, - LecturioCourseIE, - LecturioDeCourseIE, -) -from .leeco import ( - LeIE, - LePlaylistIE, - LetvCloudIE, -) +from .lecturio import LecturioCourseIE, LecturioDeCourseIE, LecturioIE +from .leeco import LeIE, LePlaylistIE, LetvCloudIE from .lego import LEGOIE from .lemonde import LemondeIE from .lenta import LentaIE from .libraryofcongress import LibraryOfCongressIE from .libsyn import LibsynIE -from .lifenews import ( - LifeNewsIE, - LifeEmbedIE, -) +from .lifenews import LifeEmbedIE, LifeNewsIE from .limelight import ( - LimelightMediaIE, LimelightChannelIE, LimelightChannelListIE, + LimelightMediaIE, ) -from .line import ( - LineTVIE, - LineLiveIE, - LineLiveChannelIE, -) -from .linkedin import ( - LinkedInLearningIE, - LinkedInLearningCourseIE, -) +from .line import LineLiveChannelIE, LineLiveIE, LineTVIE +from .linkedin import LinkedInLearningCourseIE, LinkedInLearningIE from .linuxacademy import LinuxAcademyIE from .litv import LiTVIE from .livejournal import LiveJournalIE @@ -628,37 +408,21 @@ from .lnkgo import LnkGoIE from .localnews8 import LocalNews8IE from .lovehomeporn import LoveHomePornIE from .lrt import LRTIE -from .lynda import ( - LyndaIE, - LyndaCourseIE -) +from .lynda import LyndaCourseIE, LyndaIE from .m6 import M6IE -from .mailru import ( - MailRuIE, - MailRuMusicIE, - MailRuMusicSearchIE, -) +from .mailru import MailRuIE, MailRuMusicIE, MailRuMusicSearchIE from .malltv import MallTVIE -from .mangomolo import ( - MangomoloVideoIE, - MangomoloLiveIE, -) +from .mangomolo import MangomoloLiveIE, MangomoloVideoIE from .manyvids import ManyVidsIE from .maoritv import MaoriTVIE -from .markiza import ( - MarkizaIE, - MarkizaPageIE, -) +from .markiza import MarkizaIE, MarkizaPageIE from .massengeschmacktv import MassengeschmackTVIE from .matchtv import MatchTVIE from .mdr import MDRIE from .medaltv import MedalTVIE +from .medialaan import MedialaanIE from .mediaset import MediasetIE -from .mediasite import ( - MediasiteIE, - MediasiteCatalogIE, - MediasiteNamedCatalogIE, -) +from .mediasite import MediasiteCatalogIE, MediasiteIE, MediasiteNamedCatalogIE from .medici import MediciIE from .megaphone import MegaphoneIE from .meipai import MeipaiIE @@ -670,74 +434,48 @@ from .mgoon import MgoonIE from .mgtv import MGTVIE from .miaopai import MiaoPaiIE from .microsoftvirtualacademy import ( - MicrosoftVirtualAcademyIE, MicrosoftVirtualAcademyCourseIE, + MicrosoftVirtualAcademyIE, ) -from .minds import ( - MindsIE, - MindsChannelIE, - MindsGroupIE, -) +from .minds import MindsChannelIE, MindsGroupIE, MindsIE from .ministrygrid import MinistryGridIE from .minoto import MinotoIE from .miomio import MioMioIE -from .mit import TechTVMITIE, OCWMITIE +from .mit import OCWMITIE, TechTVMITIE from .mitele import MiTeleIE -from .mixcloud import ( - MixcloudIE, - MixcloudUserIE, - MixcloudPlaylistIE, -) -from .mlb import ( - MLBIE, - MLBVideoIE, -) +from .mixcloud import MixcloudIE, MixcloudPlaylistIE, MixcloudUserIE +from .mlb import MLBIE, MLBVideoIE from .mnet import MnetIE from .moevideo import MoeVideoIE -from .mofosex import ( - MofosexIE, - MofosexEmbedIE, -) +from .mofosex import MofosexEmbedIE, MofosexIE from .mojvideo import MojvideoIE from .morningstar import MorningstarIE -from .motherless import ( - MotherlessIE, - MotherlessGroupIE -) +from .motherless import MotherlessGroupIE, MotherlessIE from .motorsport import MotorsportIE from .movieclips import MovieClipsIE from .moviezine import MoviezineIE from .movingimage import MovingImageIE from .msn import MSNIE -from .mtv import ( - MTVIE, - MTVVideoIE, - MTVServicesEmbeddedIE, - MTVDEIE, - MTVJapanIE, -) +from .mtv import MTVDEIE, MTVIE, MTVJapanIE, MTVServicesEmbeddedIE, MTVVideoIE from .muenchentv import MuenchenTVIE from .mwave import MwaveIE, MwaveMeetGreetIE from .mychannels import MyChannelsIE -from .myspace import MySpaceIE, MySpaceAlbumIE +from .myspace import MySpaceAlbumIE, MySpaceIE from .myspass import MySpassIE -from .myvi import ( - MyviIE, - MyviEmbedIE, -) +from .myvi import MyviEmbedIE, MyviIE from .myvidster import MyVidsterIE from .nationalgeographic import ( - NationalGeographicVideoIE, NationalGeographicTVIE, + NationalGeographicVideoIE, ) from .naver import NaverIE from .nba import ( - NBAWatchEmbedIE, - NBAWatchIE, - NBAWatchCollectionIE, - NBAEmbedIE, NBAIE, NBAChannelIE, + NBAEmbedIE, + NBAWatchCollectionIE, + NBAWatchEmbedIE, + NBAWatchIE, ) from .nbc import ( NBCIE, @@ -748,62 +486,38 @@ from .nbc import ( NBCSportsStreamIE, NBCSportsVPlayerIE, ) -from .ndr import ( - NDRIE, - NJoyIE, - NDREmbedBaseIE, - NDREmbedIE, - NJoyEmbedIE, -) +from .ndr import NDRIE, NDREmbedBaseIE, NDREmbedIE, NJoyEmbedIE, NJoyIE from .ndtv import NDTVIE -from .netzkino import NetzkinoIE from .nerdcubed import NerdCubedFeedIE from .neteasemusic import ( - NetEaseMusicIE, NetEaseMusicAlbumIE, - NetEaseMusicSingerIE, + NetEaseMusicDjRadioIE, + NetEaseMusicIE, NetEaseMusicListIE, NetEaseMusicMvIE, NetEaseMusicProgramIE, - NetEaseMusicDjRadioIE, -) -from .newgrounds import ( - NewgroundsIE, - NewgroundsPlaylistIE, + NetEaseMusicSingerIE, ) +from .netzkino import NetzkinoIE +from .newgrounds import NewgroundsIE, NewgroundsPlaylistIE from .newstube import NewstubeIE from .nextmedia import ( - NextMediaIE, - NextMediaActionNewsIE, AppleDailyIE, + NextMediaActionNewsIE, + NextMediaIE, NextTVIE, ) -from .nexx import ( - NexxIE, - NexxEmbedIE, -) -from .nfl import ( - NFLIE, - NFLArticleIE, -) -from .nhk import ( - NhkVodIE, - NhkVodProgramIE, -) +from .nexx import NexxEmbedIE, NexxIE +from .nfl import NFLIE, NFLArticleIE +from .nhk import NhkVodIE, NhkVodProgramIE from .nhl import NHLIE -from .nick import ( - NickIE, - NickBrIE, - NickDeIE, - NickNightIE, - NickRuIE, -) +from .nick import NickBrIE, NickDeIE, NickIE, NickNightIE, NickRuIE from .niconico import ( NiconicoIE, NiconicoPlaylistIE, NiconicoUserIE, - NicovideoSearchIE, NicovideoSearchDateIE, + NicovideoSearchIE, NicovideoSearchURLIE, ) from .ninecninemedia import NineCNineMediaIE @@ -816,35 +530,28 @@ from .nonktube import NonkTubeIE from .noovo import NoovoIE from .normalboots import NormalbootsIE from .nosvideo import NosVideoIE -from .nova import ( - NovaEmbedIE, - NovaIE, -) -from .nowness import ( - NownessIE, - NownessPlaylistIE, - NownessSeriesIE, -) +from .nova import NovaEmbedIE, NovaIE +from .nowness import NownessIE, NownessPlaylistIE, NownessSeriesIE from .noz import NozIE from .npo import ( - AndereTijdenIE, NPOIE, - NPOLiveIE, - NPORadioIE, - NPORadioFragmentIE, - SchoolTVIE, - HetKlokhuisIE, VPROIE, WNLIE, + AndereTijdenIE, + HetKlokhuisIE, + NPOLiveIE, + NPORadioFragmentIE, + NPORadioIE, + SchoolTVIE, ) from .npr import NprIE from .nrk import ( NRKIE, - NRKPlaylistIE, - NRKSkoleIE, NRKTVIE, - NRKTVDirekteIE, + NRKPlaylistIE, NRKRadioPodkastIE, + NRKSkoleIE, + NRKTVDirekteIE, NRKTVEpisodeIE, NRKTVEpisodesIE, NRKTVSeasonIE, @@ -854,56 +561,37 @@ from .nrl import NRLTVIE from .ntvcojp import NTVCoJpCUIE from .ntvde import NTVDeIE from .ntvru import NTVRuIE -from .nytimes import ( - NYTimesIE, - NYTimesArticleIE, - NYTimesCookingIE, -) from .nuvid import NuvidIE +from .nytimes import NYTimesArticleIE, NYTimesCookingIE, NYTimesIE from .nzz import NZZIE from .odatv import OdaTVIE from .odnoklassniki import OdnoklassnikiIE from .oktoberfesttv import OktoberfestTVIE from .ondemandkorea import OnDemandKoreaIE -from .onet import ( - OnetIE, - OnetChannelIE, - OnetMVPIE, - OnetPlIE, -) +from .onet import OnetChannelIE, OnetIE, OnetMVPIE, OnetPlIE from .onionstudios import OnionStudiosIE -from .ooyala import ( - OoyalaIE, - OoyalaExternalIE, -) +from .ooyala import OoyalaExternalIE, OoyalaIE from .ora import OraTVIE from .orf import ( - ORFTVthekIE, + ORFBGLIE, ORFFM4IE, - ORFFM4StoryIE, + ORFIPTVIE, + ORFKTNIE, + ORFNOEIE, ORFOE1IE, ORFOE3IE, - ORFNOEIE, - ORFWIEIE, - ORFBGLIE, ORFOOEIE, - ORFSTMIE, - ORFKTNIE, ORFSBGIE, + ORFSTMIE, ORFTIRIE, ORFVBGIE, - ORFIPTVIE, + ORFWIEIE, + ORFFM4StoryIE, + ORFTVthekIE, ) from .outsidetv import OutsideTVIE -from .packtpub import ( - PacktPubIE, - PacktPubCourseIE, -) -from .palcomp3 import ( - PalcoMP3IE, - PalcoMP3ArtistIE, - PalcoMP3VideoIE, -) +from .packtpub import PacktPubCourseIE, PacktPubIE +from .palcomp3 import PalcoMP3ArtistIE, PalcoMP3IE, PalcoMP3VideoIE from .pandoratv import PandoraTVIE from .parliamentliveuk import ParliamentLiveUKIE from .patreon import PatreonIE @@ -912,28 +600,16 @@ from .pearvideo import PearVideoIE from .peertube import PeerTubeIE from .people import PeopleIE from .performgroup import PerformGroupIE -from .periscope import ( - PeriscopeIE, - PeriscopeUserIE, -) +from .periscope import PeriscopeIE, PeriscopeUserIE from .philharmoniedeparis import PhilharmonieDeParisIE from .phoenix import PhoenixIE from .photobucket import PhotobucketIE -from .picarto import ( - PicartoIE, - PicartoVodIE, -) +from .picarto import PicartoIE, PicartoVodIE from .piksel import PikselIE from .pinkbike import PinkbikeIE -from .pinterest import ( - PinterestIE, - PinterestCollectionIE, -) +from .pinterest import PinterestCollectionIE, PinterestIE from .pladform import PladformIE -from .platzi import ( - PlatziIE, - PlatziCourseIE, -) +from .platzi import PlatziCourseIE, PlatziIE from .playfm import PlayFMIE from .playplustv import PlayPlusTVIE from .plays import PlaysTVIE @@ -941,16 +617,10 @@ from .playstuff import PlayStuffIE from .playtvak import PlaytvakIE from .playvid import PlayvidIE from .playwire import PlaywireIE -from .pluralsight import ( - PluralsightIE, - PluralsightCourseIE, -) +from .pluralsight import PluralsightCourseIE, PluralsightIE from .podomatic import PodomaticIE from .pokemon import PokemonIE -from .polskieradio import ( - PolskieRadioIE, - PolskieRadioCategoryIE, -) +from .polskieradio import PolskieRadioCategoryIE, PolskieRadioIE from .popcorntimes import PopcorntimesIE from .popcorntv import PopcornTVIE from .porn91 import Porn91IE @@ -958,68 +628,45 @@ from .porncom import PornComIE from .pornhd import PornHdIE from .pornhub import ( PornHubIE, - PornHubUserIE, PornHubPagedVideoListIE, + PornHubUserIE, PornHubUserVideosUploadIE, ) from .pornotube import PornotubeIE from .pornovoisines import PornoVoisinesIE from .pornoxo import PornoXOIE -from .puhutv import ( - PuhuTVIE, - PuhuTVSerieIE, -) from .presstv import PressTVIE from .prosiebensat1 import ProSiebenSat1IE +from .puhutv import PuhuTVIE, PuhuTVSerieIE from .puls4 import Puls4IE from .pyvideo import PyvideoIE from .qqmusic import ( - QQMusicIE, - QQMusicSingerIE, QQMusicAlbumIE, - QQMusicToplistIE, + QQMusicIE, QQMusicPlaylistIE, + QQMusicSingerIE, + QQMusicToplistIE, ) -from .r7 import ( - R7IE, - R7ArticleIE, -) -from .radiocanada import ( - RadioCanadaIE, - RadioCanadaAudioVideoIE, -) -from .radiode import RadioDeIE -from .radiojavan import RadioJavanIE +from .r7 import R7IE, R7ArticleIE from .radiobremen import RadioBremenIE +from .radiocanada import RadioCanadaAudioVideoIE, RadioCanadaIE +from .radiode import RadioDeIE from .radiofrance import RadioFranceIE -from .rai import ( - RaiPlayIE, - RaiPlayLiveIE, - RaiPlayPlaylistIE, - RaiIE, -) -from .raywenderlich import ( - RayWenderlichIE, - RayWenderlichCourseIE, -) +from .radiojavan import RadioJavanIE +from .rai import RaiIE, RaiPlayIE, RaiPlayLiveIE, RaiPlayPlaylistIE +from .raywenderlich import RayWenderlichCourseIE, RayWenderlichIE from .rbmaradio import RBMARadioIE from .rds import RDSIE from .redbulltv import ( - RedBullTVIE, RedBullEmbedIE, - RedBullTVRrnContentIE, RedBullIE, + RedBullTVIE, + RedBullTVRrnContentIE, ) -from .reddit import ( - RedditIE, - RedditRIE, -) +from .reddit import RedditIE, RedditRIE from .redtube import RedTubeIE from .regiotv import RegioTVIE -from .rentv import ( - RENTVIE, - RENTVArticleIE, -) +from .rentv import RENTVIE, RENTVArticleIE from .restudy import RestudyIE from .reuters import ReutersIE from .reverbnation import ReverbNationIE @@ -1033,23 +680,19 @@ from .roxwel import RoxwelIE from .rozhlas import RozhlasIE from .rtbf import RTBFIE from .rte import RteIE, RteRadioIE +from .rtl2 import RTL2IE, RTL2YouIE, RTL2YouSeriesIE from .rtlnl import RtlNlIE -from .rtl2 import ( - RTL2IE, - RTL2YouIE, - RTL2YouSeriesIE, -) from .rtp import RTPIE from .rts import RTSIE -from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE +from .rtve import RTVEALaCartaIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE from .rtvnh import RTVNHIE from .rtvs import RTVSIE from .ruhd import RUHDIE from .rumble import RumbleEmbedIE from .rutube import ( - RutubeIE, RutubeChannelIE, RutubeEmbedIE, + RutubeIE, RutubeMovieIE, RutubePersonIE, RutubePlaylistIE, @@ -1057,71 +700,41 @@ from .rutube import ( from .rutv import RUTVIE from .ruutu import RuutuIE from .ruv import RuvIE -from .safari import ( - SafariIE, - SafariApiIE, - SafariCourseIE, -) +from .safari import SafariApiIE, SafariCourseIE, SafariIE from .samplefocus import SampleFocusIE from .sapo import SapoIE from .savefrom import SaveFromIE from .sbs import SBSIE from .screencast import ScreencastIE from .screencastomatic import ScreencastOMaticIE -from .scrippsnetworks import ( - ScrippsNetworksWatchIE, - ScrippsNetworksIE, -) -from .scte import ( - SCTEIE, - SCTECourseIE, -) +from .scrippsnetworks import ScrippsNetworksIE, ScrippsNetworksWatchIE +from .scte import SCTEIE, SCTECourseIE from .seeker import SeekerIE from .senateisvp import SenateISVPIE from .sendtonews import SendtoNewsIE from .servus import ServusIE from .sevenplus import SevenPlusIE from .sexu import SexuIE -from .seznamzpravy import ( - SeznamZpravyIE, - SeznamZpravyArticleIE, -) -from .shahid import ( - ShahidIE, - ShahidShowIE, -) -from .shared import ( - SharedIE, - VivoIE, -) +from .seznamzpravy import SeznamZpravyArticleIE, SeznamZpravyIE +from .shahid import ShahidIE, ShahidShowIE +from .shared import SharedIE, VivoIE from .showroomlive import ShowRoomLiveIE -from .simplecast import ( - SimplecastIE, - SimplecastEpisodeIE, - SimplecastPodcastIE, -) +from .simplecast import SimplecastEpisodeIE, SimplecastIE, SimplecastPodcastIE from .sina import SinaIE from .sixplay import SixPlayIE +from .sky import SkyNewsIE, SkySportsIE, SkySportsNewsIE from .skyit import ( + CieloTVItIE, + SkyItAcademyIE, + SkyItArteIE, + SkyItIE, SkyItPlayerIE, SkyItVideoIE, SkyItVideoLiveIE, - SkyItIE, - SkyItAcademyIE, - SkyItArteIE, - CieloTVItIE, TV8ItIE, ) from .skylinewebcams import SkylineWebcamsIE -from .skynewsarabia import ( - SkyNewsArabiaIE, - SkyNewsArabiaArticleIE, -) -from .sky import ( - SkyNewsIE, - SkySportsIE, - SkySportsNewsIE, -) +from .skynewsarabia import SkyNewsArabiaArticleIE, SkyNewsArabiaIE from .slideshare import SlideshareIE from .slideslive import SlidesLiveIE from .slutload import SlutloadIE @@ -1131,44 +744,28 @@ from .sonyliv import SonyLIVIE from .soundcloud import ( SoundcloudEmbedIE, SoundcloudIE, - SoundcloudSetIE, - SoundcloudUserIE, - SoundcloudTrackStationIE, SoundcloudPlaylistIE, SoundcloudSearchIE, + SoundcloudSetIE, + SoundcloudTrackStationIE, + SoundcloudUserIE, ) -from .soundgasm import ( - SoundgasmIE, - SoundgasmProfileIE -) +from .soundgasm import SoundgasmIE, SoundgasmProfileIE from .southpark import ( - SouthParkIE, SouthParkDeIE, SouthParkDkIE, SouthParkEsIE, - SouthParkNlIE -) -from .spankbang import ( - SpankBangIE, - SpankBangPlaylistIE, + SouthParkIE, + SouthParkNlIE, ) +from .spankbang import SpankBangIE, SpankBangPlaylistIE from .spankwire import SpankwireIE from .spiegel import SpiegelIE -from .spike import ( - BellatorIE, - ParamountNetworkIE, -) -from .stitcher import ( - StitcherIE, - StitcherShowIE, -) +from .spike import BellatorIE, ParamountNetworkIE from .sport5 import Sport5IE from .sportbox import SportBoxIE from .sportdeutschland import SportDeutschlandIE -from .spotify import ( - SpotifyIE, - SpotifyShowIE, -) +from .spotify import SpotifyIE, SpotifyShowIE from .spreaker import ( SpreakerIE, SpreakerPageIE, @@ -1177,18 +774,12 @@ from .spreaker import ( ) from .springboardplatform import SpringboardPlatformIE from .sprout import SproutIE -from .srgssr import ( - SRGSSRIE, - SRGSSRPlayIE, -) +from .srgssr import SRGSSRIE, SRGSSRPlayIE from .srmediathek import SRMediathekIE from .stanfordoc import StanfordOpenClassroomIE from .steam import SteamIE -from .storyfire import ( - StoryFireIE, - StoryFireUserIE, - StoryFireSeriesIE, -) +from .stitcher import StitcherIE, StitcherShowIE +from .storyfire import StoryFireIE, StoryFireSeriesIE, StoryFireUserIE from .streamable import StreamableIE from .streamcloud import StreamcloudIE from .streamcz import StreamCZIE @@ -1196,34 +787,17 @@ from .streetvoice import StreetVoiceIE from .stretchinternet import StretchInternetIE from .stv import STVPlayerIE from .sunporno import SunPornoIE -from .sverigesradio import ( - SverigesRadioEpisodeIE, - SverigesRadioPublicationIE, -) -from .svt import ( - SVTIE, - SVTPageIE, - SVTPlayIE, - SVTSeriesIE, -) +from .sverigesradio import SverigesRadioEpisodeIE, SverigesRadioPublicationIE +from .svt import SVTIE, SVTPageIE, SVTPlayIE, SVTSeriesIE from .swrmediathek import SWRMediathekIE from .syfy import SyfyIE from .sztvhu import SztvHuIE -from .tagesschau import ( - TagesschauPlayerIE, - TagesschauIE, -) +from .tagesschau import TagesschauIE, TagesschauPlayerIE from .tass import TassIE from .tbs import TBSIE from .tdslifeway import TDSLifewayIE -from .teachable import ( - TeachableIE, - TeachableCourseIE, -) -from .teachertube import ( - TeacherTubeIE, - TeacherTubeUserIE, -) +from .teachable import TeachableCourseIE, TeachableIE +from .teachertube import TeacherTubeIE, TeacherTubeUserIE from .teachingchannel import TeachingChannelIE from .teamcoco import TeamcocoIE from .teamtreehouse import TeamTreeHouseIE @@ -1236,10 +810,10 @@ from .telecinco import TelecincoIE from .telegraaf import TelegraafIE from .telemb import TeleMBIE from .telequebec import ( - TeleQuebecIE, - TeleQuebecSquatIE, TeleQuebecEmissionIE, + TeleQuebecIE, TeleQuebecLiveIE, + TeleQuebecSquatIE, TeleQuebecVideoIE, ) from .teletask import TeleTaskIE @@ -1250,10 +824,7 @@ from .testurl import TestURLIE from .tf1 import TF1IE from .tfo import TFOIE from .theintercept import TheInterceptIE -from .theplatform import ( - ThePlatformIE, - ThePlatformFeedIE, -) +from .theplatform import ThePlatformFeedIE, ThePlatformIE from .thescene import TheSceneIE from .thestar import TheStarIE from .thesun import TheSunIE @@ -1262,35 +833,18 @@ from .thisamericanlife import ThisAmericanLifeIE from .thisav import ThisAVIE from .thisoldhouse import ThisOldHouseIE from .threeqsdn import ThreeQSDNIE -from .tiktok import ( - TikTokIE, - TikTokUserIE, -) +from .tiktok import TikTokIE, TikTokUserIE from .tinypic import TinyPicIE -from .tmz import ( - TMZIE, - TMZArticleIE, -) -from .tnaflix import ( - TNAFlixNetworkEmbedIE, - TNAFlixIE, - EMPFlixIE, - MovieFapIE, -) -from .toggle import ( - ToggleIE, - MeWatchIE, -) +from .tmz import TMZIE, TMZArticleIE +from .tnaflix import EMPFlixIE, MovieFapIE, TNAFlixIE, TNAFlixNetworkEmbedIE +from .toggle import MeWatchIE, ToggleIE from .tonline import TOnlineIE from .toongoggles import ToonGogglesIE from .toutv import TouTvIE -from .toypics import ToypicsUserIE, ToypicsIE +from .toypics import ToypicsIE, ToypicsUserIE from .traileraddict import TrailerAddictIE from .trilulilu import TriluliluIE -from .trovo import ( - TrovoIE, - TrovoVodIE, -) +from .trovo import TrovoIE, TrovoVodIE from .trunews import TruNewsIE from .trutv import TruTVIE from .tube8 import Tube8IE @@ -1298,42 +852,22 @@ from .tubitv import TubiTvIE from .tumblr import TumblrIE from .tunein import ( TuneInClipIE, - TuneInStationIE, TuneInProgramIE, - TuneInTopicIE, TuneInShortenerIE, + TuneInStationIE, + TuneInTopicIE, ) from .tunepk import TunePkIE from .turbo import TurboIE -from .tv2 import ( - TV2IE, - TV2ArticleIE, - KatsomoIE, - MTVUutisetArticleIE, -) -from .tv2dk import ( - TV2DKIE, - TV2DKBornholmPlayIE, -) +from .tv2 import TV2IE, KatsomoIE, MTVUutisetArticleIE, TV2ArticleIE +from .tv2dk import TV2DKIE, TV2DKBornholmPlayIE from .tv2hu import TV2HuIE from .tv4 import TV4IE from .tv5mondeplus import TV5MondePlusIE -from .tv5unis import ( - TV5UnisVideoIE, - TV5UnisIE, -) -from .tva import ( - TVAIE, - QubIE, -) -from .tvanouvelles import ( - TVANouvellesIE, - TVANouvellesArticleIE, -) -from .tvc import ( - TVCIE, - TVCArticleIE, -) +from .tv5unis import TV5UnisIE, TV5UnisVideoIE +from .tva import TVAIE, QubIE +from .tvanouvelles import TVANouvellesArticleIE, TVANouvellesIE +from .tvc import TVCIE, TVCArticleIE from .tver import TVerIE from .tvigle import TvigleIE from .tvland import TVLandIE @@ -1341,22 +875,14 @@ from .tvn24 import TVN24IE from .tvnet import TVNetIE from .tvnoe import TVNoeIE from .tvnow import ( + TVNowAnnualIE, TVNowIE, TVNowNewIE, TVNowSeasonIE, - TVNowAnnualIE, TVNowShowIE, ) -from .tvp import ( - TVPEmbedIE, - TVPIE, - TVPWebsiteIE, -) -from .tvplay import ( - TVPlayIE, - ViafreeIE, - TVPlayHomeIE, -) +from .tvp import TVPIE, TVPEmbedIE, TVPWebsiteIE +from .tvplay import TVPlayHomeIE, TVPlayIE, ViafreeIE from .tvplayer import TVPlayerIE from .tweakers import TweakersIE from .twentyfourvideo import TwentyFourVideoIE @@ -1364,236 +890,134 @@ from .twentymin import TwentyMinutenIE from .twentythreevideo import TwentyThreeVideoIE from .twitcasting import TwitCastingIE from .twitch import ( - TwitchVodIE, + TwitchClipsIE, TwitchCollectionIE, - TwitchVideosIE, + TwitchStreamIE, TwitchVideosClipsIE, TwitchVideosCollectionsIE, - TwitchStreamIE, - TwitchClipsIE, + TwitchVideosIE, + TwitchVodIE, ) from .twitter import ( - TwitterCardIE, - TwitterIE, TwitterAmplifyIE, TwitterBroadcastIE, + TwitterCardIE, + TwitterIE, ) -from .udemy import ( - UdemyIE, - UdemyCourseIE -) +from .udemy import UdemyCourseIE, UdemyIE from .udn import UDNEmbedIE -from .ufctv import ( - UFCTVIE, - UFCArabiaIE, -) +from .ufctv import UFCTVIE, UFCArabiaIE from .uktvplay import UKTVPlayIE -from .digiteka import DigitekaIE -from .dlive import ( - DLiveVODIE, - DLiveStreamIE, -) from .umg import UMGDeIE from .unistra import UnistraIE from .unity import UnityIE from .uol import UOLIE -from .uplynk import ( - UplynkIE, - UplynkPreplayIE, -) +from .uplynk import UplynkIE, UplynkPreplayIE from .urort import UrortIE from .urplay import URPlayIE from .usanetwork import USANetworkIE from .usatoday import USATodayIE -from .ustream import UstreamIE, UstreamChannelIE -from .ustudio import ( - UstudioIE, - UstudioEmbedIE, -) +from .ustream import UstreamChannelIE, UstreamIE +from .ustudio import UstudioEmbedIE, UstudioIE from .varzesh3 import Varzesh3IE from .vbox7 import Vbox7IE from .veehd import VeeHDIE from .veoh import VeohIE from .vesti import VestiIE -from .vevo import ( - VevoIE, - VevoPlaylistIE, -) -from .vgtv import ( - BTArticleIE, - BTVestlendingenIE, - VGTVIE, -) +from .vevo import VevoIE, VevoPlaylistIE +from .vgtv import VGTVIE, BTArticleIE, BTVestlendingenIE from .vh1 import VH1IE -from .vice import ( - ViceIE, - ViceArticleIE, - ViceShowIE, -) +from .vice import ViceArticleIE, ViceIE, ViceShowIE from .vidbit import VidbitIE from .viddler import ViddlerIE from .videa import VideaIE from .videodetective import VideoDetectiveIE from .videofyme import VideofyMeIE -from .videomore import ( - VideomoreIE, - VideomoreVideoIE, - VideomoreSeasonIE, -) +from .videomore import VideomoreIE, VideomoreSeasonIE, VideomoreVideoIE from .videopress import VideoPressIE from .vidio import VidioIE from .vidlii import VidLiiIE -from .vidme import ( - VidmeIE, - VidmeUserIE, - VidmeUserLikesIE, -) +from .vidme import VidmeIE, VidmeUserIE, VidmeUserLikesIE from .vier import VierIE, VierVideosIE -from .viewlift import ( - ViewLiftIE, - ViewLiftEmbedIE, -) +from .viewlift import ViewLiftEmbedIE, ViewLiftIE from .viidea import ViideaIE +from .viki import VikiChannelIE, VikiIE from .vimeo import ( - VimeoIE, + VHXEmbedIE, VimeoAlbumIE, VimeoChannelIE, VimeoGroupsIE, + VimeoIE, VimeoLikesIE, VimeoOndemandIE, VimeoReviewIE, VimeoUserIE, VimeoWatchLaterIE, - VHXEmbedIE, ) from .vimple import VimpleIE -from .vine import ( - VineIE, - VineUserIE, -) -from .viki import ( - VikiIE, - VikiChannelIE, -) +from .vine import VineIE, VineUserIE from .viqeo import ViqeoIE -from .viu import ( - ViuIE, - ViuPlaylistIE, - ViuOTTIE, -) -from .vk import ( - VKIE, - VKUserVideosIE, - VKWallPostIE, -) -from .vlive import ( - VLiveIE, - VLivePostIE, - VLiveChannelIE, -) +from .viu import ViuIE, ViuOTTIE, ViuPlaylistIE +from .vk import VKIE, VKUserVideosIE, VKWallPostIE +from .vlive import VLiveChannelIE, VLiveIE, VLivePostIE from .vodlocker import VodlockerIE from .vodpl import VODPlIE from .vodplatform import VODPlatformIE from .voicerepublic import VoiceRepublicIE from .voot import VootIE -from .voxmedia import ( - VoxMediaVolumeIE, - VoxMediaIE, -) -from .vrt import VRTIE +from .voxmedia import VoxMediaIE, VoxMediaVolumeIE from .vrak import VrakIE -from .vrv import ( - VRVIE, - VRVSeriesIE, -) +from .vrt import VRTIE +from .vrv import VRVIE, VRVSeriesIE from .vshare import VShareIE from .vtm import VTMIE -from .medialaan import MedialaanIE from .vube import VubeIE from .vuclip import VuClipIE -from .vvvvid import ( - VVVVIDIE, - VVVVIDShowIE, -) +from .vvvvid import VVVVIDIE, VVVVIDShowIE from .vyborymos import VyboryMosIE from .vzaar import VzaarIE from .wakanim import WakanimIE from .walla import WallaIE -from .washingtonpost import ( - WashingtonPostIE, - WashingtonPostArticleIE, -) +from .washingtonpost import WashingtonPostArticleIE, WashingtonPostIE from .wat import WatIE from .watchbox import WatchBoxIE from .watchindianporn import WatchIndianPornIE -from .wdr import ( - WDRIE, - WDRPageIE, - WDRElefantIE, - WDRMobileIE, -) -from .webcaster import ( - WebcasterIE, - WebcasterFeedIE, -) -from .webofstories import ( - WebOfStoriesIE, - WebOfStoriesPlaylistIE, -) -from .weibo import ( - WeiboIE, - WeiboMobileIE -) +from .wdr import WDRIE, WDRElefantIE, WDRMobileIE, WDRPageIE +from .webcaster import WebcasterFeedIE, WebcasterIE +from .webofstories import WebOfStoriesIE, WebOfStoriesPlaylistIE +from .weibo import WeiboIE, WeiboMobileIE from .weiqitv import WeiqiTVIE -from .wistia import ( - WistiaIE, - WistiaPlaylistIE, -) +from .wistia import WistiaIE, WistiaPlaylistIE from .worldstarhiphop import WorldStarHipHopIE -from .wsj import ( - WSJIE, - WSJArticleIE, -) +from .wsj import WSJIE, WSJArticleIE from .wwe import WWEIE from .xbef import XBefIE from .xboxclips import XboxClipsIE from .xfileshare import XFileShareIE -from .xhamster import ( - XHamsterIE, - XHamsterEmbedIE, - XHamsterUserIE, -) -from .xiami import ( - XiamiSongIE, - XiamiAlbumIE, - XiamiArtistIE, - XiamiCollectionIE -) -from .ximalaya import ( - XimalayaIE, - XimalayaAlbumIE -) +from .xhamster import XHamsterEmbedIE, XHamsterIE, XHamsterUserIE +from .xiami import XiamiAlbumIE, XiamiArtistIE, XiamiCollectionIE, XiamiSongIE +from .ximalaya import XimalayaAlbumIE, XimalayaIE from .xminus import XMinusIE from .xnxx import XNXXIE from .xstream import XstreamIE -from .xtube import XTubeUserIE, XTubeIE +from .xtube import XTubeIE, XTubeUserIE from .xuite import XuiteIE from .xvideos import XVideosIE from .xxxymovies import XXXYMoviesIE from .yahoo import ( - YahooIE, - YahooSearchIE, - YahooGyaOPlayerIE, YahooGyaOIE, + YahooGyaOPlayerIE, + YahooIE, YahooJapanNewsIE, + YahooSearchIE, ) from .yandexdisk import YandexDiskIE from .yandexmusic import ( - YandexMusicTrackIE, YandexMusicAlbumIE, - YandexMusicPlaylistIE, - YandexMusicArtistTracksIE, YandexMusicArtistAlbumsIE, + YandexMusicArtistTracksIE, + YandexMusicPlaylistIE, + YandexMusicTrackIE, ) from .yandexvideo import YandexVideoIE from .yapfiles import YapFilesIE @@ -1601,40 +1025,18 @@ from .yesjapan import YesJapanIE from .yinyuetai import YinYueTaiIE from .ynet import YnetIE from .youjizz import YouJizzIE -from .youku import ( - YoukuIE, - YoukuShowIE, -) -from .younow import ( - YouNowLiveIE, - YouNowChannelIE, - YouNowMomentIE, -) +from .youku import YoukuIE, YoukuShowIE +from .younow import YouNowChannelIE, YouNowLiveIE, YouNowMomentIE from .youporn import YouPornIE from .yourporn import YourPornIE from .yourupload import YourUploadIE -from .youtube import ( - YoutubeIE, - YoutubeFavouritesIE, - YoutubeHistoryIE, - YoutubeTabIE, - YoutubePlaylistIE, - YoutubeRecommendedIE, - YoutubeSearchDateIE, - YoutubeSearchIE, - YoutubeSearchURLIE, - YoutubeSubscriptionsIE, - YoutubeTruncatedIDIE, - YoutubeTruncatedURLIE, - YoutubeYtBeIE, - YoutubeYtUserIE, - YoutubeWatchLaterIE, -) from .zapiks import ZapiksIE from .zattoo import ( BBVTVIE, - EinsUndEinsTVIE, EWETVIE, + SAKTVIE, + VTXTVIE, + EinsUndEinsTVIE, GlattvisionTVIE, MNetTVIE, MyVisionTVIE, @@ -1644,17 +1046,12 @@ from .zattoo import ( QuicklineIE, QuicklineLiveIE, SaltTVIE, - SAKTVIE, - VTXTVIE, WalyTVIE, ZattooIE, ZattooLiveIE, ) from .zdf import ZDFIE, ZDFChannelIE from .zhihu import ZhihuIE -from .zingmp3 import ( - ZingMp3IE, - ZingMp3AlbumIE, -) +from .zingmp3 import ZingMp3AlbumIE, ZingMp3IE from .zoom import ZoomIE from .zype import ZypeIE diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dl/extractor/extremetube.py index acd4090fa..59f8e796a 100644 --- a/youtube_dl/extractor/extremetube.py +++ b/youtube_dl/extractor/extremetube.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from ..utils import str_to_int from .keezmovies import KeezMoviesIE +from ..utils import str_to_int class ExtremeTubeIE(KeezMoviesIE): diff --git a/youtube_dl/extractor/eyedotv.py b/youtube_dl/extractor/eyedotv.py index f62ddebae..3f6d8ffec 100644 --- a/youtube_dl/extractor/eyedotv.py +++ b/youtube_dl/extractor/eyedotv.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - xpath_text, - parse_duration, - ExtractorError, -) +from ..utils import ExtractorError, parse_duration, xpath_text class EyedoTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 04650af39..de8fa0f17 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -15,9 +15,9 @@ from ..compat import ( compat_urllib_parse_unquote_plus, ) from ..utils import ( + ExtractorError, clean_html, error_to_compat_str, - ExtractorError, float_or_none, get_element_by_id, int_or_none, diff --git a/youtube_dl/extractor/faz.py b/youtube_dl/extractor/faz.py index 312ee2aee..7f4265667 100644 --- a/youtube_dl/extractor/faz.py +++ b/youtube_dl/extractor/faz.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_etree_fromstring -from ..utils import ( - xpath_element, - xpath_text, - int_or_none, -) +from ..utils import int_or_none, xpath_element, xpath_text class FazIE(InfoExtractor): diff --git a/youtube_dl/extractor/fc2.py b/youtube_dl/extractor/fc2.py index 435561147..d3aeb7bb8 100644 --- a/youtube_dl/extractor/fc2.py +++ b/youtube_dl/extractor/fc2.py @@ -5,16 +5,8 @@ import hashlib import re from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_request, - compat_urlparse, -) -from ..utils import ( - ExtractorError, - sanitized_Request, - urlencode_postdata, -) +from ..compat import compat_parse_qs, compat_urllib_request, compat_urlparse +from ..utils import ExtractorError, sanitized_Request, urlencode_postdata class FC2IE(InfoExtractor): diff --git a/youtube_dl/extractor/fczenit.py b/youtube_dl/extractor/fczenit.py index 8db7c5963..1b474355e 100644 --- a/youtube_dl/extractor/fczenit.py +++ b/youtube_dl/extractor/fczenit.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, -) +from ..utils import float_or_none, int_or_none class FczenitIE(InfoExtractor): diff --git a/youtube_dl/extractor/filmon.py b/youtube_dl/extractor/filmon.py index f775fe0ba..493847613 100644 --- a/youtube_dl/extractor/filmon.py +++ b/youtube_dl/extractor/filmon.py @@ -2,16 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_HTTPError, -) -from ..utils import ( - qualities, - strip_or_none, - int_or_none, - ExtractorError, -) +from ..compat import compat_HTTPError, compat_str +from ..utils import ExtractorError, int_or_none, qualities, strip_or_none class FilmOnIE(InfoExtractor): diff --git a/youtube_dl/extractor/firsttv.py b/youtube_dl/extractor/firsttv.py index 28617d83c..8a2eec465 100644 --- a/youtube_dl/extractor/firsttv.py +++ b/youtube_dl/extractor/firsttv.py @@ -2,16 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) -from ..utils import ( - int_or_none, - qualities, - unified_strdate, - url_or_none, -) +from ..compat import compat_str, compat_urlparse +from ..utils import int_or_none, qualities, unified_strdate, url_or_none class FirstTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py index 9f166efd4..ea4b34389 100644 --- a/youtube_dl/extractor/flickr.py +++ b/youtube_dl/extractor/flickr.py @@ -1,15 +1,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_urlencode, -) -from ..utils import ( - ExtractorError, - int_or_none, - qualities, -) +from ..compat import compat_str, compat_urllib_parse_urlencode +from ..utils import ExtractorError, int_or_none, qualities class FlickrIE(InfoExtractor): diff --git a/youtube_dl/extractor/folketinget.py b/youtube_dl/extractor/folketinget.py index b3df93f28..a8670087d 100644 --- a/youtube_dl/extractor/folketinget.py +++ b/youtube_dl/extractor/folketinget.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_parse_qs -from ..utils import ( - int_or_none, - parse_duration, - parse_iso8601, - xpath_text, -) +from ..utils import int_or_none, parse_duration, parse_iso8601, xpath_text class FolketingetIE(InfoExtractor): diff --git a/youtube_dl/extractor/fox.py b/youtube_dl/extractor/fox.py index 04f4bdba6..7fd5f48e7 100644 --- a/youtube_dl/extractor/fox.py +++ b/youtube_dl/extractor/fox.py @@ -5,11 +5,7 @@ import json import uuid from .adobepass import AdobePassIE -from ..compat import ( - compat_HTTPError, - compat_str, - compat_urllib_parse_unquote, -) +from ..compat import compat_HTTPError, compat_str, compat_urllib_parse_unquote from ..utils import ( ExtractorError, int_or_none, diff --git a/youtube_dl/extractor/foxgay.py b/youtube_dl/extractor/foxgay.py index 512a10645..d2d07d42b 100644 --- a/youtube_dl/extractor/foxgay.py +++ b/youtube_dl/extractor/foxgay.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import itertools from .common import InfoExtractor -from ..utils import ( - get_element_by_id, - int_or_none, - remove_end, -) +from ..utils import get_element_by_id, int_or_none, remove_end class FoxgayIE(InfoExtractor): diff --git a/youtube_dl/extractor/franceculture.py b/youtube_dl/extractor/franceculture.py index 14f4cb489..453281b84 100644 --- a/youtube_dl/extractor/franceculture.py +++ b/youtube_dl/extractor/franceculture.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - extract_attributes, - int_or_none, -) +from ..utils import determine_ext, extract_attributes, int_or_none class FranceCultureIE(InfoExtractor): diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py index e4ec2e200..eb9dc5b5b 100644 --- a/youtube_dl/extractor/francetv.py +++ b/youtube_dl/extractor/francetv.py @@ -5,21 +5,18 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from .dailymotion import DailymotionIE +from ..compat import compat_str, compat_urlparse from ..utils import ( + ExtractorError, clean_html, determine_ext, - ExtractorError, int_or_none, parse_duration, try_get, url_or_none, urljoin, ) -from .dailymotion import DailymotionIE class FranceTVBaseInfoExtractor(InfoExtractor): diff --git a/youtube_dl/extractor/freshlive.py b/youtube_dl/extractor/freshlive.py index 72a845945..3653798a9 100644 --- a/youtube_dl/extractor/freshlive.py +++ b/youtube_dl/extractor/freshlive.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - try_get, - unified_timestamp, -) +from ..utils import ExtractorError, int_or_none, try_get, unified_timestamp class FreshLiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/frontendmasters.py b/youtube_dl/extractor/frontendmasters.py index f1db33fb1..30ac945f5 100644 --- a/youtube_dl/extractor/frontendmasters.py +++ b/youtube_dl/extractor/frontendmasters.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( ExtractorError, parse_duration, diff --git a/youtube_dl/extractor/funimation.py b/youtube_dl/extractor/funimation.py index d8f1e169a..27b94aa34 100644 --- a/youtube_dl/extractor/funimation.py +++ b/youtube_dl/extractor/funimation.py @@ -7,11 +7,11 @@ import string from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( + ExtractorError, determine_ext, int_or_none, js_to_json, - ExtractorError, - urlencode_postdata + urlencode_postdata, ) diff --git a/youtube_dl/extractor/funk.py b/youtube_dl/extractor/funk.py index 81d1949fd..d93fec4be 100644 --- a/youtube_dl/extractor/funk.py +++ b/youtube_dl/extractor/funk.py @@ -5,10 +5,7 @@ import re from .common import InfoExtractor from .nexx import NexxIE -from ..utils import ( - int_or_none, - str_or_none, -) +from ..utils import int_or_none, str_or_none class FunkIE(InfoExtractor): diff --git a/youtube_dl/extractor/fusion.py b/youtube_dl/extractor/fusion.py index a3f44b812..dffd61b84 100644 --- a/youtube_dl/extractor/fusion.py +++ b/youtube_dl/extractor/fusion.py @@ -1,12 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - mimetype2ext, - parse_iso8601, -) +from ..utils import determine_ext, int_or_none, mimetype2ext, parse_iso8601 class FusionIE(InfoExtractor): diff --git a/youtube_dl/extractor/gaia.py b/youtube_dl/extractor/gaia.py index e9527758f..ab371d273 100644 --- a/youtube_dl/extractor/gaia.py +++ b/youtube_dl/extractor/gaia.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_unquote, -) +from ..compat import compat_str, compat_urllib_parse_unquote from ..utils import ( ExtractorError, int_or_none, diff --git a/youtube_dl/extractor/gameinformer.py b/youtube_dl/extractor/gameinformer.py index f1b96c172..0cf11f4a0 100644 --- a/youtube_dl/extractor/gameinformer.py +++ b/youtube_dl/extractor/gameinformer.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals from .brightcove import BrightcoveNewIE from .common import InfoExtractor -from ..utils import ( - clean_html, - get_element_by_class, - get_element_by_id, -) +from ..utils import clean_html, get_element_by_class, get_element_by_id class GameInformerIE(InfoExtractor): diff --git a/youtube_dl/extractor/gamestar.py b/youtube_dl/extractor/gamestar.py index f00dab2f3..02df5c2f5 100644 --- a/youtube_dl/extractor/gamestar.py +++ b/youtube_dl/extractor/gamestar.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - remove_end, -) +from ..utils import int_or_none, remove_end class GameStarIE(InfoExtractor): diff --git a/youtube_dl/extractor/gaskrank.py b/youtube_dl/extractor/gaskrank.py index 1726a6704..48bdd0522 100644 --- a/youtube_dl/extractor/gaskrank.py +++ b/youtube_dl/extractor/gaskrank.py @@ -2,12 +2,9 @@ from __future__ import unicode_literals import re + from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, - unified_strdate, -) +from ..utils import float_or_none, int_or_none, unified_strdate class GaskrankIE(InfoExtractor): diff --git a/youtube_dl/extractor/gedidigital.py b/youtube_dl/extractor/gedidigital.py index 6c4153b40..4beecc6a0 100644 --- a/youtube_dl/extractor/gedidigital.py +++ b/youtube_dl/extractor/gedidigital.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, -) +from ..utils import determine_ext, int_or_none class GediDigitalIE(InfoExtractor): diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index a9c064105..ef1275ca5 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -6,8 +6,90 @@ import os import re import sys -from .common import InfoExtractor +from .common import InfoExtractor # isort: split +from .anvato import AnvatoIE +from .apa import APAIE +from .arcpublishing import ArcPublishingIE +from .arkena import ArkenaIE +from .arte import ArteTVEmbedIE +from .brightcove import BrightcoveLegacyIE, BrightcoveNewIE +from .channel9 import Channel9IE +from .cloudflarestream import CloudflareStreamIE +from .commonprotocols import RtmpIE +from .condenast import CondeNastIE +from .dailymail import DailyMailIE +from .dailymotion import DailymotionIE +from .dbtv import DBTVIE +from .digiteka import DigitekaIE +from .drtuber import DrTuberIE +from .eagleplatform import EaglePlatformIE +from .expressen import ExpressenIE +from .facebook import FacebookIE +from .foxnews import FoxNewsIE +from .googledrive import GoogleDriveIE +from .indavideo import IndavideoEmbedIE +from .instagram import InstagramIE +from .joj import JojIE +from .jwplatform import JWPlatformIE +from .kaltura import KalturaIE +from .kinja import KinjaEmbedIE +from .limelight import LimelightBaseIE +from .medialaan import MedialaanIE +from .mediaset import MediasetIE +from .mediasite import MediasiteIE +from .megaphone import MegaphoneIE +from .mofosex import MofosexEmbedIE +from .mtv import MTVServicesEmbeddedIE +from .myvi import MyviIE +from .nbc import NBCSportsVPlayerIE +from .nexx import NexxEmbedIE, NexxIE +from .odnoklassniki import OdnoklassnikiIE +from .onionstudios import OnionStudiosIE +from .ooyala import OoyalaIE +from .peertube import PeerTubeIE +from .piksel import PikselIE +from .pladform import PladformIE +from .pornhub import PornHubIE +from .redtube import RedTubeIE +from .rutube import RutubeIE +from .rutv import RUTVIE +from .senateisvp import SenateISVPIE +from .simplecast import SimplecastIE +from .soundcloud import SoundcloudEmbedIE +from .spankwire import SpankwireIE +from .sportbox import SportBoxIE +from .springboardplatform import SpringboardPlatformIE +from .svt import SVTIE +from .teachable import TeachableIE +from .theplatform import ThePlatformIE +from .threeqsdn import ThreeQSDNIE +from .tnaflix import TNAFlixNetworkEmbedIE +from .tube8 import Tube8IE +from .tunein import TuneInBaseIE +from .tvc import TVCIE +from .twentymin import TwentyMinutenIE +from .udn import UDNEmbedIE +from .ustream import UstreamIE +from .vbox7 import Vbox7IE +from .vice import ViceIE +from .videa import VideaIE +from .videomore import VideomoreIE +from .videopress import VideoPressIE +from .viewlift import ViewLiftEmbedIE +from .vimeo import VHXEmbedIE, VimeoIE +from .viqeo import ViqeoIE +from .vk import VKIE +from .vshare import VShareIE +from .vzaar import VzaarIE +from .washingtonpost import WashingtonPostIE +from .webcaster import WebcasterFeedIE +from .wistia import WistiaIE +from .xfileshare import XFileShareIE +from .xhamster import XHamsterEmbedIE +from .yapfiles import YapFilesIE +from .youporn import YouPornIE from .youtube import YoutubeIE +from .zype import ZypeIE from ..compat import ( compat_etree_fromstring, compat_str, @@ -16,14 +98,15 @@ from ..compat import ( compat_xml_parse_error, ) from ..utils import ( - determine_ext, + KNOWN_EXTENSIONS, ExtractorError, - float_or_none, HEADRequest, + UnsupportedError, + determine_ext, + float_or_none, int_or_none, is_html, js_to_json, - KNOWN_EXTENSIONS, merge_dicts, mimetype2ext, orderedSet, @@ -33,103 +116,11 @@ from ..utils import ( unescapeHTML, unified_timestamp, unsmuggle_url, - UnsupportedError, url_or_none, xpath_attr, xpath_text, xpath_with_ns, ) -from .commonprotocols import RtmpIE -from .brightcove import ( - BrightcoveLegacyIE, - BrightcoveNewIE, -) -from .nexx import ( - NexxIE, - NexxEmbedIE, -) -from .nbc import NBCSportsVPlayerIE -from .ooyala import OoyalaIE -from .rutv import RUTVIE -from .tvc import TVCIE -from .sportbox import SportBoxIE -from .myvi import MyviIE -from .condenast import CondeNastIE -from .udn import UDNEmbedIE -from .senateisvp import SenateISVPIE -from .svt import SVTIE -from .pornhub import PornHubIE -from .xhamster import XHamsterEmbedIE -from .tnaflix import TNAFlixNetworkEmbedIE -from .drtuber import DrTuberIE -from .redtube import RedTubeIE -from .tube8 import Tube8IE -from .mofosex import MofosexEmbedIE -from .spankwire import SpankwireIE -from .youporn import YouPornIE -from .vimeo import ( - VimeoIE, - VHXEmbedIE, -) -from .dailymotion import DailymotionIE -from .dailymail import DailyMailIE -from .onionstudios import OnionStudiosIE -from .viewlift import ViewLiftEmbedIE -from .mtv import MTVServicesEmbeddedIE -from .pladform import PladformIE -from .videomore import VideomoreIE -from .webcaster import WebcasterFeedIE -from .googledrive import GoogleDriveIE -from .jwplatform import JWPlatformIE -from .digiteka import DigitekaIE -from .arkena import ArkenaIE -from .instagram import InstagramIE -from .threeqsdn import ThreeQSDNIE -from .theplatform import ThePlatformIE -from .kaltura import KalturaIE -from .eagleplatform import EaglePlatformIE -from .facebook import FacebookIE -from .soundcloud import SoundcloudEmbedIE -from .tunein import TuneInBaseIE -from .vbox7 import Vbox7IE -from .dbtv import DBTVIE -from .piksel import PikselIE -from .videa import VideaIE -from .twentymin import TwentyMinutenIE -from .ustream import UstreamIE -from .arte import ArteTVEmbedIE -from .videopress import VideoPressIE -from .rutube import RutubeIE -from .limelight import LimelightBaseIE -from .anvato import AnvatoIE -from .washingtonpost import WashingtonPostIE -from .wistia import WistiaIE -from .mediaset import MediasetIE -from .joj import JojIE -from .megaphone import MegaphoneIE -from .vzaar import VzaarIE -from .channel9 import Channel9IE -from .vshare import VShareIE -from .mediasite import MediasiteIE -from .springboardplatform import SpringboardPlatformIE -from .yapfiles import YapFilesIE -from .vice import ViceIE -from .xfileshare import XFileShareIE -from .cloudflarestream import CloudflareStreamIE -from .peertube import PeerTubeIE -from .teachable import TeachableIE -from .indavideo import IndavideoEmbedIE -from .apa import APAIE -from .foxnews import FoxNewsIE -from .viqeo import ViqeoIE -from .expressen import ExpressenIE -from .zype import ZypeIE -from .odnoklassniki import OdnoklassnikiIE -from .vk import VKIE -from .kinja import KinjaEmbedIE -from .arcpublishing import ArcPublishingIE -from .medialaan import MedialaanIE -from .simplecast import SimplecastIE class GenericIE(InfoExtractor): diff --git a/youtube_dl/extractor/gfycat.py b/youtube_dl/extractor/gfycat.py index 18a30fe67..2f13f20ec 100644 --- a/youtube_dl/extractor/gfycat.py +++ b/youtube_dl/extractor/gfycat.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, - qualities, - ExtractorError, -) +from ..utils import ExtractorError, float_or_none, int_or_none, qualities class GfycatIE(InfoExtractor): diff --git a/youtube_dl/extractor/giantbomb.py b/youtube_dl/extractor/giantbomb.py index c6477958d..100584286 100644 --- a/youtube_dl/extractor/giantbomb.py +++ b/youtube_dl/extractor/giantbomb.py @@ -1,15 +1,10 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - qualities, - unescapeHTML, -) +from ..utils import determine_ext, int_or_none, qualities, unescapeHTML class GiantBombIE(InfoExtractor): diff --git a/youtube_dl/extractor/giga.py b/youtube_dl/extractor/giga.py index 5a9992a27..9577625db 100644 --- a/youtube_dl/extractor/giga.py +++ b/youtube_dl/extractor/giga.py @@ -5,10 +5,10 @@ import itertools from .common import InfoExtractor from ..utils import ( - qualities, compat_str, parse_duration, parse_iso8601, + qualities, str_to_int, ) diff --git a/youtube_dl/extractor/gigya.py b/youtube_dl/extractor/gigya.py index 412178492..d21315d26 100644 --- a/youtube_dl/extractor/gigya.py +++ b/youtube_dl/extractor/gigya.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor - -from ..utils import ( - ExtractorError, - urlencode_postdata, -) +from ..utils import ExtractorError, urlencode_postdata class GigyaBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/globo.py b/youtube_dl/extractor/globo.py index 60d842d3a..3cc6d7913 100644 --- a/youtube_dl/extractor/globo.py +++ b/youtube_dl/extractor/globo.py @@ -8,10 +8,7 @@ import random import re from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( ExtractorError, float_or_none, diff --git a/youtube_dl/extractor/go.py b/youtube_dl/extractor/go.py index 878ba14e6..09eaac8bb 100644 --- a/youtube_dl/extractor/go.py +++ b/youtube_dl/extractor/go.py @@ -6,12 +6,12 @@ import re from .adobepass import AdobePassIE from ..compat import compat_str from ..utils import ( - int_or_none, + ExtractorError, determine_ext, + int_or_none, parse_age_limit, try_get, urlencode_postdata, - ExtractorError, ) diff --git a/youtube_dl/extractor/godtube.py b/youtube_dl/extractor/godtube.py index 92efd16b3..516483cb4 100644 --- a/youtube_dl/extractor/godtube.py +++ b/youtube_dl/extractor/godtube.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, -) +from ..utils import parse_duration, parse_iso8601 class GodTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/golem.py b/youtube_dl/extractor/golem.py index 47a068e74..4321e30e1 100644 --- a/youtube_dl/extractor/golem.py +++ b/youtube_dl/extractor/golem.py @@ -2,13 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) -from ..utils import ( - determine_ext, -) +from ..compat import compat_str, compat_urlparse +from ..utils import determine_ext class GolemIE(InfoExtractor): diff --git a/youtube_dl/extractor/googledrive.py b/youtube_dl/extractor/googledrive.py index 3f2de00f1..35c2e926e 100644 --- a/youtube_dl/extractor/googledrive.py +++ b/youtube_dl/extractor/googledrive.py @@ -5,8 +5,8 @@ import re from .common import InfoExtractor from ..compat import compat_parse_qs from ..utils import ( - determine_ext, ExtractorError, + determine_ext, get_element_by_class, int_or_none, lowercase_escape, diff --git a/youtube_dl/extractor/googlepodcasts.py b/youtube_dl/extractor/googlepodcasts.py index 31ad79907..8592f40e5 100644 --- a/youtube_dl/extractor/googlepodcasts.py +++ b/youtube_dl/extractor/googlepodcasts.py @@ -5,12 +5,7 @@ import json import re from .common import InfoExtractor -from ..utils import ( - clean_podcast_url, - int_or_none, - try_get, - urlencode_postdata, -) +from ..utils import clean_podcast_url, int_or_none, try_get, urlencode_postdata class GooglePodcastsBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/goshgay.py b/youtube_dl/extractor/goshgay.py index 377981d3e..3fae9c440 100644 --- a/youtube_dl/extractor/goshgay.py +++ b/youtube_dl/extractor/goshgay.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, -) -from ..utils import ( - parse_duration, -) +from ..compat import compat_parse_qs +from ..utils import parse_duration class GoshgayIE(InfoExtractor): diff --git a/youtube_dl/extractor/hbo.py b/youtube_dl/extractor/hbo.py index 68df748f5..51d1d82ce 100644 --- a/youtube_dl/extractor/hbo.py +++ b/youtube_dl/extractor/hbo.py @@ -5,11 +5,11 @@ import re from .common import InfoExtractor from ..utils import ( - xpath_text, - xpath_element, int_or_none, parse_duration, urljoin, + xpath_element, + xpath_text, ) diff --git a/youtube_dl/extractor/hearthisat.py b/youtube_dl/extractor/hearthisat.py index 18c252012..8f2d5dca4 100644 --- a/youtube_dl/extractor/hearthisat.py +++ b/youtube_dl/extractor/hearthisat.py @@ -6,8 +6,8 @@ import re from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - HEADRequest, KNOWN_EXTENSIONS, + HEADRequest, sanitized_Request, str_to_int, urlencode_postdata, diff --git a/youtube_dl/extractor/heise.py b/youtube_dl/extractor/heise.py index cbe564a3c..2d94468e6 100644 --- a/youtube_dl/extractor/heise.py +++ b/youtube_dl/extractor/heise.py @@ -5,9 +5,9 @@ from .common import InfoExtractor from .kaltura import KalturaIE from .youtube import YoutubeIE from ..utils import ( + NO_DEFAULT, determine_ext, int_or_none, - NO_DEFAULT, parse_iso8601, smuggle_url, xpath_text, diff --git a/youtube_dl/extractor/hellporno.py b/youtube_dl/extractor/hellporno.py index fae425103..360a171be 100644 --- a/youtube_dl/extractor/hellporno.py +++ b/youtube_dl/extractor/hellporno.py @@ -1,12 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - merge_dicts, - remove_end, - unified_timestamp, -) +from ..utils import int_or_none, merge_dicts, remove_end, unified_timestamp class HellPornoIE(InfoExtractor): diff --git a/youtube_dl/extractor/hidive.py b/youtube_dl/extractor/hidive.py index f26f80265..cee5fd067 100644 --- a/youtube_dl/extractor/hidive.py +++ b/youtube_dl/extractor/hidive.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - url_or_none, - urlencode_postdata, -) +from ..utils import ExtractorError, int_or_none, url_or_none, urlencode_postdata class HiDiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/hitbox.py b/youtube_dl/extractor/hitbox.py index 3e5ff2685..5c4340f68 100644 --- a/youtube_dl/extractor/hitbox.py +++ b/youtube_dl/extractor/hitbox.py @@ -6,11 +6,11 @@ import re from .common import InfoExtractor from ..utils import ( clean_html, - parse_iso8601, - float_or_none, - int_or_none, compat_str, determine_ext, + float_or_none, + int_or_none, + parse_iso8601, ) diff --git a/youtube_dl/extractor/hitrecord.py b/youtube_dl/extractor/hitrecord.py index fd5dc2935..1975ae9ac 100644 --- a/youtube_dl/extractor/hitrecord.py +++ b/youtube_dl/extractor/hitrecord.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - clean_html, - float_or_none, - int_or_none, - try_get, -) +from ..utils import clean_html, float_or_none, int_or_none, try_get class HitRecordIE(InfoExtractor): diff --git a/youtube_dl/extractor/hketv.py b/youtube_dl/extractor/hketv.py index 1f3502b90..4bd9e182b 100644 --- a/youtube_dl/extractor/hketv.py +++ b/youtube_dl/extractor/hketv.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, merge_dicts, parse_count, diff --git a/youtube_dl/extractor/hornbunny.py b/youtube_dl/extractor/hornbunny.py index c458a959d..f4082ffd3 100644 --- a/youtube_dl/extractor/hornbunny.py +++ b/youtube_dl/extractor/hornbunny.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, -) +from ..utils import int_or_none, parse_duration class HornBunnyIE(InfoExtractor): diff --git a/youtube_dl/extractor/hotstar.py b/youtube_dl/extractor/hotstar.py index 1620822b6..1c366cb8b 100644 --- a/youtube_dl/extractor/hotstar.py +++ b/youtube_dl/extractor/hotstar.py @@ -9,13 +9,10 @@ import time import uuid from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, str_or_none, try_get, diff --git a/youtube_dl/extractor/howstuffworks.py b/youtube_dl/extractor/howstuffworks.py index cf90ab3c9..a2cfb1913 100644 --- a/youtube_dl/extractor/howstuffworks.py +++ b/youtube_dl/extractor/howstuffworks.py @@ -2,11 +2,11 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( + determine_ext, find_xpath_attr, int_or_none, js_to_json, unescapeHTML, - determine_ext, ) diff --git a/youtube_dl/extractor/hrfernsehen.py b/youtube_dl/extractor/hrfernsehen.py index 11b879dbd..46bd54efc 100644 --- a/youtube_dl/extractor/hrfernsehen.py +++ b/youtube_dl/extractor/hrfernsehen.py @@ -5,12 +5,8 @@ from __future__ import unicode_literals import json import re -from ..utils import ( - int_or_none, - unified_timestamp, - unescapeHTML -) from .common import InfoExtractor +from ..utils import int_or_none, unescapeHTML, unified_timestamp class HRFernsehenIE(InfoExtractor): diff --git a/youtube_dl/extractor/hrti.py b/youtube_dl/extractor/hrti.py index 23f7b1fc9..98c42f49f 100644 --- a/youtube_dl/extractor/hrti.py +++ b/youtube_dl/extractor/hrti.py @@ -7,8 +7,8 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, parse_age_limit, sanitized_Request, diff --git a/youtube_dl/extractor/huajiao.py b/youtube_dl/extractor/huajiao.py index 4ca275dda..e2aa92c99 100644 --- a/youtube_dl/extractor/huajiao.py +++ b/youtube_dl/extractor/huajiao.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, -) +from ..utils import parse_duration, parse_iso8601 class HuajiaoIE(InfoExtractor): diff --git a/youtube_dl/extractor/huffpost.py b/youtube_dl/extractor/huffpost.py index 97e36f056..40ef6a3fd 100644 --- a/youtube_dl/extractor/huffpost.py +++ b/youtube_dl/extractor/huffpost.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - parse_duration, - unified_strdate, -) +from ..utils import determine_ext, parse_duration, unified_strdate class HuffPostIE(InfoExtractor): diff --git a/youtube_dl/extractor/hungama.py b/youtube_dl/extractor/hungama.py index 3fdaac5b6..c79646a52 100644 --- a/youtube_dl/extractor/hungama.py +++ b/youtube_dl/extractor/hungama.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - urlencode_postdata, -) +from ..utils import int_or_none, urlencode_postdata class HungamaIE(InfoExtractor): diff --git a/youtube_dl/extractor/ign.py b/youtube_dl/extractor/ign.py index 0d9f50ed2..081845411 100644 --- a/youtube_dl/extractor/ign.py +++ b/youtube_dl/extractor/ign.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse from ..utils import ( HEADRequest, determine_ext, diff --git a/youtube_dl/extractor/iheart.py b/youtube_dl/extractor/iheart.py index b54c05eeb..f9f9ec918 100644 --- a/youtube_dl/extractor/iheart.py +++ b/youtube_dl/extractor/iheart.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - clean_html, - clean_podcast_url, - int_or_none, - str_or_none, -) +from ..utils import clean_html, clean_podcast_url, int_or_none, str_or_none class IHeartRadioBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/imggaming.py b/youtube_dl/extractor/imggaming.py index e11f92053..b1b5ca119 100644 --- a/youtube_dl/extractor/imggaming.py +++ b/youtube_dl/extractor/imggaming.py @@ -6,12 +6,7 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - ExtractorError, - int_or_none, - str_or_none, - try_get, -) +from ..utils import ExtractorError, int_or_none, str_or_none, try_get class ImgGamingBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/imgur.py b/youtube_dl/extractor/imgur.py index a5ba03efa..11810cc8e 100644 --- a/youtube_dl/extractor/imgur.py +++ b/youtube_dl/extractor/imgur.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - js_to_json, - mimetype2ext, - ExtractorError, -) +from ..utils import ExtractorError, int_or_none, js_to_json, mimetype2ext class ImgurIE(InfoExtractor): diff --git a/youtube_dl/extractor/infoq.py b/youtube_dl/extractor/infoq.py index 60b02b699..6838985e4 100644 --- a/youtube_dl/extractor/infoq.py +++ b/youtube_dl/extractor/infoq.py @@ -1,20 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -from ..utils import ( - ExtractorError, -) +from .bokecc import BokeCCBaseIE from ..compat import ( compat_b64decode, compat_urllib_parse_unquote, compat_urlparse, ) -from ..utils import ( - determine_ext, - update_url_query, -) -from .bokecc import BokeCCBaseIE +from ..utils import ExtractorError, determine_ext, update_url_query class InfoQIE(BokeCCBaseIE): diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py index 12e10143c..b7bcca64e 100644 --- a/youtube_dl/extractor/instagram.py +++ b/youtube_dl/extractor/instagram.py @@ -1,15 +1,12 @@ from __future__ import unicode_literals -import itertools import hashlib +import itertools import json import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_HTTPError, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( ExtractorError, float_or_none, diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dl/extractor/internetvideoarchive.py index 59b0a90c3..f00358c23 100644 --- a/youtube_dl/extractor/internetvideoarchive.py +++ b/youtube_dl/extractor/internetvideoarchive.py @@ -4,10 +4,7 @@ import json import re from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) +from ..compat import compat_parse_qs, compat_urlparse class InternetVideoArchiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/iprima.py b/youtube_dl/extractor/iprima.py index 648ae6741..addec6905 100644 --- a/youtube_dl/extractor/iprima.py +++ b/youtube_dl/extractor/iprima.py @@ -5,10 +5,7 @@ import re import time from .common import InfoExtractor -from ..utils import ( - determine_ext, - js_to_json, -) +from ..utils import determine_ext, js_to_json class IPrimaIE(InfoExtractor): diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dl/extractor/iqiyi.py index 5df674daf..8bebc0e42 100644 --- a/youtube_dl/extractor/iqiyi.py +++ b/youtube_dl/extractor/iqiyi.py @@ -7,16 +7,13 @@ import re import time from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_urlencode, -) +from ..compat import compat_str, compat_urllib_parse_urlencode from ..utils import ( + ExtractorError, clean_html, decode_packed_codes, - get_element_by_id, get_element_by_attribute, - ExtractorError, + get_element_by_id, ohdave_rsa_encrypt, remove_start, ) diff --git a/youtube_dl/extractor/itv.py b/youtube_dl/extractor/itv.py index e86c40b42..d3b56a624 100644 --- a/youtube_dl/extractor/itv.py +++ b/youtube_dl/extractor/itv.py @@ -4,14 +4,14 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor from .brightcove import BrightcoveNewIE +from .common import InfoExtractor from ..utils import ( + JSON_LD_RE, clean_html, determine_ext, extract_attributes, get_element_by_class, - JSON_LD_RE, merge_dicts, parse_duration, smuggle_url, diff --git a/youtube_dl/extractor/ivi.py b/youtube_dl/extractor/ivi.py index b5a740a01..be53b7abf 100644 --- a/youtube_dl/extractor/ivi.py +++ b/youtube_dl/extractor/ivi.py @@ -6,11 +6,7 @@ import re import sys from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - qualities, -) +from ..utils import ExtractorError, int_or_none, qualities class IviIE(InfoExtractor): diff --git a/youtube_dl/extractor/ivideon.py b/youtube_dl/extractor/ivideon.py index 3ca824f79..848e63c0a 100644 --- a/youtube_dl/extractor/ivideon.py +++ b/youtube_dl/extractor/ivideon.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_urlparse, -) +from ..compat import compat_urllib_parse_urlencode, compat_urlparse from ..utils import qualities diff --git a/youtube_dl/extractor/iwara.py b/youtube_dl/extractor/iwara.py index 907d5fc8b..32eb85fdc 100644 --- a/youtube_dl/extractor/iwara.py +++ b/youtube_dl/extractor/iwara.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_urllib_parse_urlparse -from ..utils import ( - int_or_none, - mimetype2ext, - remove_end, - url_or_none, -) +from ..utils import int_or_none, mimetype2ext, remove_end, url_or_none class IwaraIE(InfoExtractor): diff --git a/youtube_dl/extractor/izlesene.py b/youtube_dl/extractor/izlesene.py index f8fca6c8f..1fac54ba3 100644 --- a/youtube_dl/extractor/izlesene.py +++ b/youtube_dl/extractor/izlesene.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_unquote, -) +from ..compat import compat_str, compat_urllib_parse_unquote from ..utils import ( determine_ext, float_or_none, diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py index 1db7c64af..4abb1fc3c 100644 --- a/youtube_dl/extractor/jamendo.py +++ b/youtube_dl/extractor/jamendo.py @@ -4,13 +4,9 @@ from __future__ import unicode_literals import hashlib import random -from ..compat import compat_str from .common import InfoExtractor -from ..utils import ( - clean_html, - int_or_none, - try_get, -) +from ..compat import compat_str +from ..utils import clean_html, int_or_none, try_get class JamendoIE(InfoExtractor): diff --git a/youtube_dl/extractor/joj.py b/youtube_dl/extractor/joj.py index 62b28e980..fc50c939f 100644 --- a/youtube_dl/extractor/joj.py +++ b/youtube_dl/extractor/joj.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - js_to_json, - try_get, -) +from ..utils import int_or_none, js_to_json, try_get class JojIE(InfoExtractor): diff --git a/youtube_dl/extractor/jove.py b/youtube_dl/extractor/jove.py index 27e0e37f6..6009002c0 100644 --- a/youtube_dl/extractor/jove.py +++ b/youtube_dl/extractor/jove.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - unified_strdate -) +from ..utils import ExtractorError, unified_strdate class JoveIE(InfoExtractor): diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py index 6d4d93394..cfd06e748 100644 --- a/youtube_dl/extractor/kaltura.py +++ b/youtube_dl/extractor/kaltura.py @@ -1,20 +1,17 @@ # coding: utf-8 from __future__ import unicode_literals -import re import base64 +import re from .common import InfoExtractor -from ..compat import ( - compat_urlparse, - compat_parse_qs, -) +from ..compat import compat_parse_qs, compat_urlparse from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, - unsmuggle_url, smuggle_url, + unsmuggle_url, ) diff --git a/youtube_dl/extractor/kankan.py b/youtube_dl/extractor/kankan.py index a677ff447..b1eba7413 100644 --- a/youtube_dl/extractor/kankan.py +++ b/youtube_dl/extractor/kankan.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -import re import hashlib +import re from .common import InfoExtractor diff --git a/youtube_dl/extractor/karrierevideos.py b/youtube_dl/extractor/karrierevideos.py index 7b291e0a0..6c06d0d38 100644 --- a/youtube_dl/extractor/karrierevideos.py +++ b/youtube_dl/extractor/karrierevideos.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - fix_xml_ampersands, - float_or_none, - xpath_with_ns, - xpath_text, -) +from ..utils import fix_xml_ampersands, float_or_none, xpath_text, xpath_with_ns class KarriereVideosIE(InfoExtractor): diff --git a/youtube_dl/extractor/keezmovies.py b/youtube_dl/extractor/keezmovies.py index c3eb74c17..0a8e4e3c4 100644 --- a/youtube_dl/extractor/keezmovies.py +++ b/youtube_dl/extractor/keezmovies.py @@ -6,8 +6,8 @@ from .common import InfoExtractor from ..aes import aes_decrypt_text from ..compat import compat_urllib_parse_unquote from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, str_to_int, strip_or_none, diff --git a/youtube_dl/extractor/ketnet.py b/youtube_dl/extractor/ketnet.py index e0599d02f..68debecc2 100644 --- a/youtube_dl/extractor/ketnet.py +++ b/youtube_dl/extractor/ketnet.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals from .canvas import CanvasIE from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote -from ..utils import ( - int_or_none, - parse_iso8601, -) +from ..utils import int_or_none, parse_iso8601 class KetnetIE(InfoExtractor): diff --git a/youtube_dl/extractor/khanacademy.py b/youtube_dl/extractor/khanacademy.py index 87e520378..cd2fa4eeb 100644 --- a/youtube_dl/extractor/khanacademy.py +++ b/youtube_dl/extractor/khanacademy.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import json from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, - try_get, -) +from ..utils import int_or_none, parse_iso8601, try_get class KhanAcademyBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/kinja.py b/youtube_dl/extractor/kinja.py index 79e3026d2..55ea89a5b 100644 --- a/youtube_dl/extractor/kinja.py +++ b/youtube_dl/extractor/kinja.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_unquote, -) +from ..compat import compat_str, compat_urllib_parse_unquote from ..utils import ( int_or_none, parse_iso8601, diff --git a/youtube_dl/extractor/kinopoisk.py b/youtube_dl/extractor/kinopoisk.py index 9e8d01f53..4721ff35d 100644 --- a/youtube_dl/extractor/kinopoisk.py +++ b/youtube_dl/extractor/kinopoisk.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - dict_get, - int_or_none, -) +from ..utils import dict_get, int_or_none class KinoPoiskIE(InfoExtractor): diff --git a/youtube_dl/extractor/konserthusetplay.py b/youtube_dl/extractor/konserthusetplay.py index dd42bb2f2..b20c5d9fb 100644 --- a/youtube_dl/extractor/konserthusetplay.py +++ b/youtube_dl/extractor/konserthusetplay.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - float_or_none, - int_or_none, - url_or_none, -) +from ..utils import determine_ext, float_or_none, int_or_none, url_or_none class KonserthusetPlayIE(InfoExtractor): diff --git a/youtube_dl/extractor/krasview.py b/youtube_dl/extractor/krasview.py index d27d052ff..a605c6958 100644 --- a/youtube_dl/extractor/krasview.py +++ b/youtube_dl/extractor/krasview.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import json from .common import InfoExtractor -from ..utils import ( - int_or_none, - js_to_json, -) +from ..utils import int_or_none, js_to_json class KrasViewIE(InfoExtractor): diff --git a/youtube_dl/extractor/kusi.py b/youtube_dl/extractor/kusi.py index 9833d35eb..519a93007 100644 --- a/youtube_dl/extractor/kusi.py +++ b/youtube_dl/extractor/kusi.py @@ -7,8 +7,8 @@ import re from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote_plus from ..utils import ( - int_or_none, float_or_none, + int_or_none, timeconvert, update_url_query, xpath_text, diff --git a/youtube_dl/extractor/kuwo.py b/youtube_dl/extractor/kuwo.py index cc5b2a1c1..7957d8c85 100644 --- a/youtube_dl/extractor/kuwo.py +++ b/youtube_dl/extractor/kuwo.py @@ -6,10 +6,10 @@ import re from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - get_element_by_id, - clean_html, ExtractorError, InAdvancePagedList, + clean_html, + get_element_by_id, remove_start, ) diff --git a/youtube_dl/extractor/la7.py b/youtube_dl/extractor/la7.py index c3b4ffa7e..6a4943d56 100644 --- a/youtube_dl/extractor/la7.py +++ b/youtube_dl/extractor/la7.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - js_to_json, - smuggle_url, -) +from ..utils import js_to_json, smuggle_url class LA7IE(InfoExtractor): diff --git a/youtube_dl/extractor/laola1tv.py b/youtube_dl/extractor/laola1tv.py index fa217365a..b13054e48 100644 --- a/youtube_dl/extractor/laola1tv.py +++ b/youtube_dl/extractor/laola1tv.py @@ -7,12 +7,12 @@ import re from .common import InfoExtractor from ..utils import ( ExtractorError, + js_to_json, unified_strdate, + update_url_query, urlencode_postdata, xpath_element, xpath_text, - update_url_query, - js_to_json, ) diff --git a/youtube_dl/extractor/lbry.py b/youtube_dl/extractor/lbry.py index cfd6b8393..2a7f9edab 100644 --- a/youtube_dl/extractor/lbry.py +++ b/youtube_dl/extractor/lbry.py @@ -12,11 +12,11 @@ from ..compat import ( compat_urllib_parse_urlparse, ) from ..utils import ( - determine_ext, ExtractorError, + OnDemandPagedList, + determine_ext, int_or_none, mimetype2ext, - OnDemandPagedList, try_get, urljoin, ) diff --git a/youtube_dl/extractor/lcp.py b/youtube_dl/extractor/lcp.py index ade27a99e..9e741cbb6 100644 --- a/youtube_dl/extractor/lcp.py +++ b/youtube_dl/extractor/lcp.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from .arkena import ArkenaIE +from .common import InfoExtractor class LcpPlayIE(ArkenaIE): diff --git a/youtube_dl/extractor/lecture2go.py b/youtube_dl/extractor/lecture2go.py index 81b5d41be..58a248a6b 100644 --- a/youtube_dl/extractor/lecture2go.py +++ b/youtube_dl/extractor/lecture2go.py @@ -7,8 +7,8 @@ from .common import InfoExtractor from ..utils import ( determine_ext, determine_protocol, - parse_duration, int_or_none, + parse_duration, ) diff --git a/youtube_dl/extractor/lecturio.py b/youtube_dl/extractor/lecturio.py index 1b2dcef46..07bde0927 100644 --- a/youtube_dl/extractor/lecturio.py +++ b/youtube_dl/extractor/lecturio.py @@ -5,9 +5,9 @@ import re from .common import InfoExtractor from ..utils import ( + ExtractorError, clean_html, determine_ext, - ExtractorError, float_or_none, int_or_none, str_or_none, diff --git a/youtube_dl/extractor/leeco.py b/youtube_dl/extractor/leeco.py index 7dc0ad794..b84ed09d0 100644 --- a/youtube_dl/extractor/leeco.py +++ b/youtube_dl/extractor/leeco.py @@ -14,9 +14,9 @@ from ..compat import ( compat_urllib_parse_urlencode, ) from ..utils import ( + ExtractorError, determine_ext, encode_data_uri, - ExtractorError, int_or_none, orderedSet, parse_iso8601, diff --git a/youtube_dl/extractor/lego.py b/youtube_dl/extractor/lego.py index 1e3c19dfd..607f783dd 100644 --- a/youtube_dl/extractor/lego.py +++ b/youtube_dl/extractor/lego.py @@ -6,11 +6,7 @@ import uuid from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - ExtractorError, - int_or_none, - qualities, -) +from ..utils import ExtractorError, int_or_none, qualities class LEGOIE(InfoExtractor): diff --git a/youtube_dl/extractor/libraryofcongress.py b/youtube_dl/extractor/libraryofcongress.py index 03f205144..1ad9c644a 100644 --- a/youtube_dl/extractor/libraryofcongress.py +++ b/youtube_dl/extractor/libraryofcongress.py @@ -4,13 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor - -from ..utils import ( - determine_ext, - float_or_none, - int_or_none, - parse_filesize, -) +from ..utils import determine_ext, float_or_none, int_or_none, parse_filesize class LibraryOfCongressIE(InfoExtractor): diff --git a/youtube_dl/extractor/lifenews.py b/youtube_dl/extractor/lifenews.py index 42e263bfa..18433a1a0 100644 --- a/youtube_dl/extractor/lifenews.py +++ b/youtube_dl/extractor/lifenews.py @@ -4,13 +4,10 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, parse_iso8601, remove_end, diff --git a/youtube_dl/extractor/limelight.py b/youtube_dl/extractor/limelight.py index 39f74d282..1bf5f2044 100644 --- a/youtube_dl/extractor/limelight.py +++ b/youtube_dl/extractor/limelight.py @@ -6,13 +6,13 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( + ExtractorError, determine_ext, float_or_none, int_or_none, smuggle_url, try_get, unsmuggle_url, - ExtractorError, ) diff --git a/youtube_dl/extractor/line.py b/youtube_dl/extractor/line.py index 2526daa77..31f344a84 100644 --- a/youtube_dl/extractor/line.py +++ b/youtube_dl/extractor/line.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - js_to_json, - str_or_none, -) +from ..utils import ExtractorError, int_or_none, js_to_json, str_or_none class LineTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/linuxacademy.py b/youtube_dl/extractor/linuxacademy.py index 7ec4a6557..16830e8ad 100644 --- a/youtube_dl/extractor/linuxacademy.py +++ b/youtube_dl/extractor/linuxacademy.py @@ -5,14 +5,10 @@ import random import re from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_HTTPError, - compat_str, -) +from ..compat import compat_b64decode, compat_HTTPError, compat_str from ..utils import ( - clean_html, ExtractorError, + clean_html, js_to_json, parse_duration, try_get, diff --git a/youtube_dl/extractor/litv.py b/youtube_dl/extractor/litv.py index 337b1b15c..26124a006 100644 --- a/youtube_dl/extractor/litv.py +++ b/youtube_dl/extractor/litv.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import json from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - smuggle_url, - unsmuggle_url, -) +from ..utils import ExtractorError, int_or_none, smuggle_url, unsmuggle_url class LiTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py index e55b1a202..6ed14ff56 100644 --- a/youtube_dl/extractor/livestream.py +++ b/youtube_dl/extractor/livestream.py @@ -1,24 +1,21 @@ from __future__ import unicode_literals -import re import itertools +import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - find_xpath_attr, - xpath_attr, - xpath_with_ns, - xpath_text, - orderedSet, - update_url_query, - int_or_none, - float_or_none, - parse_iso8601, determine_ext, + find_xpath_attr, + float_or_none, + int_or_none, + orderedSet, + parse_iso8601, + update_url_query, + xpath_attr, + xpath_text, + xpath_with_ns, ) diff --git a/youtube_dl/extractor/lnkgo.py b/youtube_dl/extractor/lnkgo.py index 3e71852aa..a85d6eedd 100644 --- a/youtube_dl/extractor/lnkgo.py +++ b/youtube_dl/extractor/lnkgo.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - clean_html, - compat_str, - int_or_none, - parse_iso8601, -) +from ..utils import clean_html, compat_str, int_or_none, parse_iso8601 class LnkGoIE(InfoExtractor): diff --git a/youtube_dl/extractor/lrt.py b/youtube_dl/extractor/lrt.py index 89d549858..3143aedbc 100644 --- a/youtube_dl/extractor/lrt.py +++ b/youtube_dl/extractor/lrt.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - clean_html, - merge_dicts, -) +from ..utils import clean_html, merge_dicts class LRTIE(InfoExtractor): diff --git a/youtube_dl/extractor/lynda.py b/youtube_dl/extractor/lynda.py index b3d8653d0..5286362a9 100644 --- a/youtube_dl/extractor/lynda.py +++ b/youtube_dl/extractor/lynda.py @@ -3,15 +3,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) -from ..utils import ( - ExtractorError, - int_or_none, - urlencode_postdata, -) +from ..compat import compat_str, compat_urlparse +from ..utils import ExtractorError, int_or_none, urlencode_postdata class LyndaBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/mailru.py b/youtube_dl/extractor/mailru.py index 65cc474db..fb5d3e5b4 100644 --- a/youtube_dl/extractor/mailru.py +++ b/youtube_dl/extractor/mailru.py @@ -7,12 +7,7 @@ import re from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote -from ..utils import ( - int_or_none, - parse_duration, - remove_end, - try_get, -) +from ..utils import int_or_none, parse_duration, remove_end, try_get class MailRuIE(InfoExtractor): diff --git a/youtube_dl/extractor/mangomolo.py b/youtube_dl/extractor/mangomolo.py index acee370e9..689589a6f 100644 --- a/youtube_dl/extractor/mangomolo.py +++ b/youtube_dl/extractor/mangomolo.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_urllib_parse_unquote, -) +from ..compat import compat_b64decode, compat_urllib_parse_unquote from ..utils import int_or_none diff --git a/youtube_dl/extractor/markiza.py b/youtube_dl/extractor/markiza.py index def960a0c..fc5ceb198 100644 --- a/youtube_dl/extractor/markiza.py +++ b/youtube_dl/extractor/markiza.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - orderedSet, - parse_duration, - try_get, -) +from ..utils import orderedSet, parse_duration, try_get class MarkizaIE(InfoExtractor): diff --git a/youtube_dl/extractor/mdr.py b/youtube_dl/extractor/mdr.py index dc6aa9819..667bb6c25 100644 --- a/youtube_dl/extractor/mdr.py +++ b/youtube_dl/extractor/mdr.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( determine_ext, int_or_none, diff --git a/youtube_dl/extractor/medialaan.py b/youtube_dl/extractor/medialaan.py index 788acf7fb..aace6281c 100644 --- a/youtube_dl/extractor/medialaan.py +++ b/youtube_dl/extractor/medialaan.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - extract_attributes, - int_or_none, - mimetype2ext, - parse_iso8601, -) +from ..utils import extract_attributes, int_or_none, mimetype2ext, parse_iso8601 class MedialaanIE(InfoExtractor): diff --git a/youtube_dl/extractor/mediaset.py b/youtube_dl/extractor/mediaset.py index 20048c6ab..a6437ffe3 100644 --- a/youtube_dl/extractor/mediaset.py +++ b/youtube_dl/extractor/mediaset.py @@ -4,15 +4,8 @@ from __future__ import unicode_literals import re from .theplatform import ThePlatformBaseIE -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) -from ..utils import ( - ExtractorError, - int_or_none, - update_url_query, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse +from ..utils import ExtractorError, int_or_none, update_url_query class MediasetIE(ThePlatformBaseIE): diff --git a/youtube_dl/extractor/mediasite.py b/youtube_dl/extractor/mediasite.py index d6eb15740..117ac2f6e 100644 --- a/youtube_dl/extractor/mediasite.py +++ b/youtube_dl/extractor/mediasite.py @@ -1,14 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( ExtractorError, float_or_none, @@ -21,7 +18,6 @@ from ..utils import ( urljoin, ) - _ID_RE = r'(?:[0-9a-f]{32,34}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12,14})' diff --git a/youtube_dl/extractor/medici.py b/youtube_dl/extractor/medici.py index cd910238e..77ec91e60 100644 --- a/youtube_dl/extractor/medici.py +++ b/youtube_dl/extractor/medici.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - unified_strdate, - update_url_query, - urlencode_postdata, -) +from ..utils import unified_strdate, update_url_query, urlencode_postdata class MediciIE(InfoExtractor): diff --git a/youtube_dl/extractor/meipai.py b/youtube_dl/extractor/meipai.py index 2445b8b39..0a4a03779 100644 --- a/youtube_dl/extractor/meipai.py +++ b/youtube_dl/extractor/meipai.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - unified_timestamp, -) +from ..utils import int_or_none, parse_duration, unified_timestamp class MeipaiIE(InfoExtractor): diff --git a/youtube_dl/extractor/melonvod.py b/youtube_dl/extractor/melonvod.py index bd8cf13ab..1f58a7c60 100644 --- a/youtube_dl/extractor/melonvod.py +++ b/youtube_dl/extractor/melonvod.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - urljoin, -) +from ..utils import int_or_none, urljoin class MelonVODIE(InfoExtractor): diff --git a/youtube_dl/extractor/meta.py b/youtube_dl/extractor/meta.py index cdb46e163..0c3022ce3 100644 --- a/youtube_dl/extractor/meta.py +++ b/youtube_dl/extractor/meta.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from .pladform import PladformIE -from ..utils import ( - unescapeHTML, - int_or_none, - ExtractorError, -) +from ..utils import ExtractorError, int_or_none, unescapeHTML class METAIE(InfoExtractor): diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dl/extractor/metacafe.py index 9e92416d1..5bc34ee11 100644 --- a/youtube_dl/extractor/metacafe.py +++ b/youtube_dl/extractor/metacafe.py @@ -10,10 +10,10 @@ from ..compat import ( compat_urllib_parse_unquote, ) from ..utils import ( - determine_ext, ExtractorError, - int_or_none, + determine_ext, get_element_by_attribute, + int_or_none, mimetype2ext, ) diff --git a/youtube_dl/extractor/metacritic.py b/youtube_dl/extractor/metacritic.py index 7d468d78b..83792bce3 100644 --- a/youtube_dl/extractor/metacritic.py +++ b/youtube_dl/extractor/metacritic.py @@ -3,9 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - fix_xml_ampersands, -) +from ..utils import fix_xml_ampersands class MetacriticIE(InfoExtractor): diff --git a/youtube_dl/extractor/mgoon.py b/youtube_dl/extractor/mgoon.py index 7bb473900..89ba6b9af 100644 --- a/youtube_dl/extractor/mgoon.py +++ b/youtube_dl/extractor/mgoon.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - qualities, - unified_strdate, -) +from ..utils import ExtractorError, qualities, unified_strdate class MgoonIE(InfoExtractor): diff --git a/youtube_dl/extractor/mgtv.py b/youtube_dl/extractor/mgtv.py index cab3aa045..332ea8c61 100644 --- a/youtube_dl/extractor/mgtv.py +++ b/youtube_dl/extractor/mgtv.py @@ -6,14 +6,8 @@ import time import uuid from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) -from ..utils import ( - ExtractorError, - int_or_none, -) +from ..compat import compat_HTTPError, compat_str +from ..utils import ExtractorError, int_or_none class MGTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/microsoftvirtualacademy.py b/youtube_dl/extractor/microsoftvirtualacademy.py index 8e0aee0e6..c4bb2f426 100644 --- a/youtube_dl/extractor/microsoftvirtualacademy.py +++ b/youtube_dl/extractor/microsoftvirtualacademy.py @@ -3,9 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_xpath, -) +from ..compat import compat_xpath from ..utils import ( int_or_none, parse_duration, diff --git a/youtube_dl/extractor/minds.py b/youtube_dl/extractor/minds.py index e8fd582aa..a8eca3ace 100644 --- a/youtube_dl/extractor/minds.py +++ b/youtube_dl/extractor/minds.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - clean_html, - int_or_none, - str_or_none, - strip_or_none, -) +from ..utils import clean_html, int_or_none, str_or_none, strip_or_none class MindsBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/ministrygrid.py b/youtube_dl/extractor/ministrygrid.py index 8ad9239c5..e6174fcd6 100644 --- a/youtube_dl/extractor/ministrygrid.py +++ b/youtube_dl/extractor/ministrygrid.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - smuggle_url, -) +from ..utils import ExtractorError, smuggle_url class MinistryGridIE(InfoExtractor): diff --git a/youtube_dl/extractor/minoto.py b/youtube_dl/extractor/minoto.py index 636731195..0b40af13a 100644 --- a/youtube_dl/extractor/minoto.py +++ b/youtube_dl/extractor/minoto.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_codecs, -) +from ..utils import int_or_none, parse_codecs class MinotoIE(InfoExtractor): diff --git a/youtube_dl/extractor/miomio.py b/youtube_dl/extractor/miomio.py index 40f72d66f..2644fec31 100644 --- a/youtube_dl/extractor/miomio.py +++ b/youtube_dl/extractor/miomio.py @@ -5,12 +5,7 @@ import random from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - xpath_text, - int_or_none, - ExtractorError, - sanitized_Request, -) +from ..utils import ExtractorError, int_or_none, sanitized_Request, xpath_text class MioMioIE(InfoExtractor): diff --git a/youtube_dl/extractor/mit.py b/youtube_dl/extractor/mit.py index e1506a745..4caa851f3 100644 --- a/youtube_dl/extractor/mit.py +++ b/youtube_dl/extractor/mit.py @@ -1,15 +1,11 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor from .youtube import YoutubeIE -from ..utils import ( - clean_html, - ExtractorError, - get_element_by_id, -) +from ..utils import ExtractorError, clean_html, get_element_by_id class TechTVMITIE(InfoExtractor): diff --git a/youtube_dl/extractor/mitele.py b/youtube_dl/extractor/mitele.py index b5937233b..399f0e5cd 100644 --- a/youtube_dl/extractor/mitele.py +++ b/youtube_dl/extractor/mitele.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .telecinco import TelecincoIE -from ..utils import ( - int_or_none, - parse_iso8601, -) +from ..utils import int_or_none, parse_iso8601 class MiTeleIE(TelecincoIE): diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dl/extractor/mixcloud.py index 69319857d..965dc304e 100644 --- a/youtube_dl/extractor/mixcloud.py +++ b/youtube_dl/extractor/mixcloud.py @@ -10,14 +10,9 @@ from ..compat import ( compat_ord, compat_str, compat_urllib_parse_unquote, - compat_zip -) -from ..utils import ( - int_or_none, - parse_iso8601, - strip_or_none, - try_get, + compat_zip, ) +from ..utils import int_or_none, parse_iso8601, strip_or_none, try_get class MixcloudBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/mnet.py b/youtube_dl/extractor/mnet.py index 0e26ca1b3..042e6df79 100644 --- a/youtube_dl/extractor/mnet.py +++ b/youtube_dl/extractor/mnet.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - parse_iso8601, -) +from ..utils import int_or_none, parse_duration, parse_iso8601 class MnetIE(InfoExtractor): diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dl/extractor/moevideo.py index eb9b4ce7c..29298ab5c 100644 --- a/youtube_dl/extractor/moevideo.py +++ b/youtube_dl/extractor/moevideo.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - clean_html, - int_or_none, -) +from ..utils import clean_html, int_or_none class MoeVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/mofosex.py b/youtube_dl/extractor/mofosex.py index 5234cac02..d66bc8443 100644 --- a/youtube_dl/extractor/mofosex.py +++ b/youtube_dl/extractor/mofosex.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - str_to_int, - unified_strdate, -) from .keezmovies import KeezMoviesIE +from ..utils import int_or_none, str_to_int, unified_strdate class MofosexIE(KeezMoviesIE): diff --git a/youtube_dl/extractor/mojvideo.py b/youtube_dl/extractor/mojvideo.py index 165e658c9..6db318f8b 100644 --- a/youtube_dl/extractor/mojvideo.py +++ b/youtube_dl/extractor/mojvideo.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - parse_duration, -) +from ..utils import ExtractorError, parse_duration class MojvideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/motorsport.py b/youtube_dl/extractor/motorsport.py index c9d1ab64d..1c848f8b7 100644 --- a/youtube_dl/extractor/motorsport.py +++ b/youtube_dl/extractor/motorsport.py @@ -2,9 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_urlparse, -) +from ..compat import compat_urlparse class MotorsportIE(InfoExtractor): diff --git a/youtube_dl/extractor/movieclips.py b/youtube_dl/extractor/movieclips.py index 5453da1ac..eabda11e9 100644 --- a/youtube_dl/extractor/movieclips.py +++ b/youtube_dl/extractor/movieclips.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - smuggle_url, - float_or_none, - parse_iso8601, - update_url_query, -) +from ..utils import float_or_none, parse_iso8601, smuggle_url, update_url_query class MovieClipsIE(InfoExtractor): diff --git a/youtube_dl/extractor/movingimage.py b/youtube_dl/extractor/movingimage.py index 4f62d628a..649799bd6 100644 --- a/youtube_dl/extractor/movingimage.py +++ b/youtube_dl/extractor/movingimage.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - unescapeHTML, - parse_duration, -) +from ..utils import parse_duration, unescapeHTML class MovingImageIE(InfoExtractor): diff --git a/youtube_dl/extractor/msn.py b/youtube_dl/extractor/msn.py index e59b0b7b0..beef44c9f 100644 --- a/youtube_dl/extractor/msn.py +++ b/youtube_dl/extractor/msn.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - determine_ext, - ExtractorError, - int_or_none, - unescapeHTML, -) +from ..utils import ExtractorError, determine_ext, int_or_none, unescapeHTML class MSNIE(InfoExtractor): diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py index 5a5205c0e..72b293677 100644 --- a/youtube_dl/extractor/mtv.py +++ b/youtube_dl/extractor/mtv.py @@ -4,17 +4,14 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_xpath, -) +from ..compat import compat_str, compat_xpath from ..utils import ( ExtractorError, + HEADRequest, + RegexNotFoundError, find_xpath_attr, fix_xml_ampersands, float_or_none, - HEADRequest, - RegexNotFoundError, sanitized_Request, strip_or_none, timeconvert, diff --git a/youtube_dl/extractor/muenchentv.py b/youtube_dl/extractor/muenchentv.py index 2cc2bf229..62c2e6e52 100644 --- a/youtube_dl/extractor/muenchentv.py +++ b/youtube_dl/extractor/muenchentv.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import json from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - js_to_json, -) +from ..utils import determine_ext, int_or_none, js_to_json class MuenchenTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/mwave.py b/youtube_dl/extractor/mwave.py index a67276596..c838afea9 100644 --- a/youtube_dl/extractor/mwave.py +++ b/youtube_dl/extractor/mwave.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - parse_duration, -) +from ..utils import int_or_none, parse_duration class MwaveIE(InfoExtractor): diff --git a/youtube_dl/extractor/myspace.py b/youtube_dl/extractor/myspace.py index e164d5940..71f1aa111 100644 --- a/youtube_dl/extractor/myspace.py +++ b/youtube_dl/extractor/myspace.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) +from ..utils import ExtractorError, int_or_none, parse_iso8601 class MySpaceIE(InfoExtractor): diff --git a/youtube_dl/extractor/myspass.py b/youtube_dl/extractor/myspass.py index f540c52ee..36f1db8d4 100644 --- a/youtube_dl/extractor/myspass.py +++ b/youtube_dl/extractor/myspass.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - parse_duration, - xpath_text, -) +from ..utils import int_or_none, parse_duration, xpath_text class MySpassIE(InfoExtractor): diff --git a/youtube_dl/extractor/nationalgeographic.py b/youtube_dl/extractor/nationalgeographic.py index ee12e2b47..a32b851c7 100644 --- a/youtube_dl/extractor/nationalgeographic.py +++ b/youtube_dl/extractor/nationalgeographic.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from .fox import FOXIE -from ..utils import ( - smuggle_url, - url_basename, -) +from ..utils import smuggle_url, url_basename class NationalGeographicVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/naver.py b/youtube_dl/extractor/naver.py index 61fc59126..9e3ae77c8 100644 --- a/youtube_dl/extractor/naver.py +++ b/youtube_dl/extractor/naver.py @@ -5,9 +5,9 @@ import re from .common import InfoExtractor from ..utils import ( + ExtractorError, clean_html, dict_get, - ExtractorError, int_or_none, parse_duration, try_get, diff --git a/youtube_dl/extractor/nba.py b/youtube_dl/extractor/nba.py index fbc7adaf4..368448fb6 100644 --- a/youtube_dl/extractor/nba.py +++ b/youtube_dl/extractor/nba.py @@ -11,9 +11,9 @@ from ..compat import ( compat_urllib_parse_urlparse, ) from ..utils import ( + OnDemandPagedList, int_or_none, merge_dicts, - OnDemandPagedList, parse_duration, parse_iso8601, try_get, diff --git a/youtube_dl/extractor/nbc.py b/youtube_dl/extractor/nbc.py index 0d77648c2..f150e5523 100644 --- a/youtube_dl/extractor/nbc.py +++ b/youtube_dl/extractor/nbc.py @@ -4,9 +4,9 @@ import base64 import json import re +from .adobepass import AdobePassIE from .common import InfoExtractor from .theplatform import ThePlatformIE -from .adobepass import AdobePassIE from ..compat import compat_urllib_parse_unquote from ..utils import ( int_or_none, diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py index 26627f8b0..565112af9 100644 --- a/youtube_dl/extractor/ndr.py +++ b/youtube_dl/extractor/ndr.py @@ -6,8 +6,8 @@ import re from .common import InfoExtractor from ..compat import compat_urllib_parse_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, merge_dicts, parse_iso8601, diff --git a/youtube_dl/extractor/ndtv.py b/youtube_dl/extractor/ndtv.py index bc3eb9160..7dd67999b 100644 --- a/youtube_dl/extractor/ndtv.py +++ b/youtube_dl/extractor/ndtv.py @@ -2,15 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote_plus -) -from ..utils import ( - parse_duration, - remove_end, - unified_strdate, - urljoin -) +from ..compat import compat_urllib_parse_unquote_plus +from ..utils import parse_duration, remove_end, unified_strdate, urljoin class NDTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py index 5e5c6271b..917b802b4 100644 --- a/youtube_dl/extractor/neteasemusic.py +++ b/youtube_dl/extractor/neteasemusic.py @@ -1,21 +1,21 @@ # coding: utf-8 from __future__ import unicode_literals +import json +import re +import time from base64 import b64encode from binascii import hexlify from datetime import datetime from hashlib import md5 from random import randint -import json -import re -import time from .common import InfoExtractor from ..aes import aes_ecb_encrypt, pkcs7_padding from ..compat import ( - compat_urllib_parse_urlencode, - compat_str, compat_itertools_count, + compat_str, + compat_urllib_parse_urlencode, ) from ..utils import ( ExtractorError, diff --git a/youtube_dl/extractor/netzkino.py b/youtube_dl/extractor/netzkino.py index aec3026b1..88f6af8a2 100644 --- a/youtube_dl/extractor/netzkino.py +++ b/youtube_dl/extractor/netzkino.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - clean_html, - int_or_none, - js_to_json, - parse_iso8601, -) +from ..utils import clean_html, int_or_none, js_to_json, parse_iso8601 class NetzkinoIE(InfoExtractor): diff --git a/youtube_dl/extractor/nfl.py b/youtube_dl/extractor/nfl.py index 871923e4c..a6d43835e 100644 --- a/youtube_dl/extractor/nfl.py +++ b/youtube_dl/extractor/nfl.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - clean_html, - determine_ext, - get_element_by_class, -) +from ..utils import clean_html, determine_ext, get_element_by_class class NFLBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/nhl.py b/youtube_dl/extractor/nhl.py index eddfe1f37..b02db5499 100644 --- a/youtube_dl/extractor/nhl.py +++ b/youtube_dl/extractor/nhl.py @@ -4,12 +4,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - determine_ext, - int_or_none, - parse_iso8601, - parse_duration, -) +from ..utils import determine_ext, int_or_none, parse_duration, parse_iso8601 class NHLBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/niconico.py b/youtube_dl/extractor/niconico.py index 93f813968..40a949337 100644 --- a/youtube_dl/extractor/niconico.py +++ b/youtube_dl/extractor/niconico.py @@ -7,21 +7,17 @@ import json import re from .common import InfoExtractor, SearchInfoExtractor +from ..compat import compat_parse_qs, compat_str, compat_urllib_parse_urlparse from ..postprocessor.ffmpeg import FFmpegPostProcessor -from ..compat import ( - compat_parse_qs, - compat_str, - compat_urllib_parse_urlparse, -) from ..utils import ( ExtractorError, + OnDemandPagedList, + PostProcessingError, dict_get, float_or_none, int_or_none, - OnDemandPagedList, parse_duration, parse_iso8601, - PostProcessingError, remove_start, str_or_none, try_get, diff --git a/youtube_dl/extractor/ninenow.py b/youtube_dl/extractor/ninenow.py index 6157dc7c1..789cafb42 100644 --- a/youtube_dl/extractor/ninenow.py +++ b/youtube_dl/extractor/ninenow.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - float_or_none, - smuggle_url, -) +from ..utils import ExtractorError, float_or_none, int_or_none, smuggle_url class NineNowIE(InfoExtractor): diff --git a/youtube_dl/extractor/njpwworld.py b/youtube_dl/extractor/njpwworld.py index 3639d142f..999d87f15 100644 --- a/youtube_dl/extractor/njpwworld.py +++ b/youtube_dl/extractor/njpwworld.py @@ -5,10 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - get_element_by_class, - urlencode_postdata, -) +from ..utils import get_element_by_class, urlencode_postdata class NJPWWorldIE(InfoExtractor): diff --git a/youtube_dl/extractor/nobelprize.py b/youtube_dl/extractor/nobelprize.py index 4dfdb09d6..862c33e96 100644 --- a/youtube_dl/extractor/nobelprize.py +++ b/youtube_dl/extractor/nobelprize.py @@ -3,12 +3,12 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( - js_to_json, - mimetype2ext, determine_ext, - update_url_query, get_element_by_attribute, int_or_none, + js_to_json, + mimetype2ext, + update_url_query, ) diff --git a/youtube_dl/extractor/noovo.py b/youtube_dl/extractor/noovo.py index b40770d07..03db99e6d 100644 --- a/youtube_dl/extractor/noovo.py +++ b/youtube_dl/extractor/noovo.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals from .brightcove import BrightcoveNewIE from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - js_to_json, - smuggle_url, - try_get, -) +from ..utils import int_or_none, js_to_json, smuggle_url, try_get class NoovoIE(InfoExtractor): diff --git a/youtube_dl/extractor/normalboots.py b/youtube_dl/extractor/normalboots.py index 61fe571df..6a8d1ad62 100644 --- a/youtube_dl/extractor/normalboots.py +++ b/youtube_dl/extractor/normalboots.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from .jwplatform import JWPlatformIE - -from ..utils import ( - unified_strdate, -) +from ..utils import unified_strdate class NormalbootsIE(InfoExtractor): diff --git a/youtube_dl/extractor/nowness.py b/youtube_dl/extractor/nowness.py index f26dafb8f..786843ec0 100644 --- a/youtube_dl/extractor/nowness.py +++ b/youtube_dl/extractor/nowness.py @@ -1,16 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals -from .brightcove import ( - BrightcoveLegacyIE, - BrightcoveNewIE, -) +from .brightcove import BrightcoveLegacyIE, BrightcoveNewIE from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - sanitized_Request, -) +from ..utils import ExtractorError, sanitized_Request class NownessBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/noz.py b/youtube_dl/extractor/noz.py index ccafd7723..23c8ec9b6 100644 --- a/youtube_dl/extractor/noz.py +++ b/youtube_dl/extractor/noz.py @@ -2,16 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote, - compat_xpath, -) -from ..utils import ( - int_or_none, - find_xpath_attr, - xpath_text, - update_url_query, -) +from ..compat import compat_urllib_parse_unquote, compat_xpath +from ..utils import find_xpath_attr, int_or_none, update_url_query, xpath_text class NozIE(InfoExtractor): diff --git a/youtube_dl/extractor/npo.py b/youtube_dl/extractor/npo.py index e525ad928..19f847dc2 100644 --- a/youtube_dl/extractor/npo.py +++ b/youtube_dl/extractor/npo.py @@ -3,13 +3,10 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( - determine_ext, ExtractorError, + determine_ext, fix_xml_ampersands, int_or_none, merge_dicts, diff --git a/youtube_dl/extractor/npr.py b/youtube_dl/extractor/npr.py index 9d1122f0c..d28803b9d 100644 --- a/youtube_dl/extractor/npr.py +++ b/youtube_dl/extractor/npr.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - qualities, - url_or_none, -) +from ..utils import int_or_none, qualities, url_or_none class NprIE(InfoExtractor): diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py index 5a62b50fc..eaa06876e 100644 --- a/youtube_dl/extractor/nrk.py +++ b/youtube_dl/extractor/nrk.py @@ -8,14 +8,14 @@ import re from .common import InfoExtractor from ..compat import compat_str from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, parse_duration, str_or_none, try_get, - urljoin, url_or_none, + urljoin, ) diff --git a/youtube_dl/extractor/ntvcojp.py b/youtube_dl/extractor/ntvcojp.py index 0c8221b22..55eff8fe3 100644 --- a/youtube_dl/extractor/ntvcojp.py +++ b/youtube_dl/extractor/ntvcojp.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - js_to_json, - smuggle_url, -) +from ..utils import js_to_json, smuggle_url class NTVCoJpCUIE(InfoExtractor): diff --git a/youtube_dl/extractor/ntvde.py b/youtube_dl/extractor/ntvde.py index 101a5374c..06f5f54be 100644 --- a/youtube_dl/extractor/ntvde.py +++ b/youtube_dl/extractor/ntvde.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - js_to_json, - parse_duration, -) +from ..utils import int_or_none, js_to_json, parse_duration class NTVDeIE(InfoExtractor): diff --git a/youtube_dl/extractor/ntvru.py b/youtube_dl/extractor/ntvru.py index c47d1dfa4..0c4f05355 100644 --- a/youtube_dl/extractor/ntvru.py +++ b/youtube_dl/extractor/ntvru.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - strip_or_none, - unescapeHTML, - xpath_text, -) +from ..utils import int_or_none, strip_or_none, unescapeHTML, xpath_text class NTVRuIE(InfoExtractor): diff --git a/youtube_dl/extractor/nuevo.py b/youtube_dl/extractor/nuevo.py index be1e09d37..5d4843a4f 100644 --- a/youtube_dl/extractor/nuevo.py +++ b/youtube_dl/extractor/nuevo.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor - -from ..utils import ( - float_or_none, - xpath_text -) +from ..utils import float_or_none, xpath_text class NuevoBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/nuvid.py b/youtube_dl/extractor/nuvid.py index f6c94dd77..329cbaedb 100644 --- a/youtube_dl/extractor/nuvid.py +++ b/youtube_dl/extractor/nuvid.py @@ -1,16 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals +import re + from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - parse_duration, - int_or_none, - try_get, - url_or_none, -) - -import re +from ..utils import int_or_none, parse_duration, try_get, url_or_none class NuvidIE(InfoExtractor): diff --git a/youtube_dl/extractor/nytimes.py b/youtube_dl/extractor/nytimes.py index 976b1c694..1f2ed6e5c 100644 --- a/youtube_dl/extractor/nytimes.py +++ b/youtube_dl/extractor/nytimes.py @@ -1,9 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -import hmac -import hashlib import base64 +import hashlib +import hmac from .common import InfoExtractor from ..utils import ( diff --git a/youtube_dl/extractor/nzz.py b/youtube_dl/extractor/nzz.py index 61ee77adb..85a50cd88 100644 --- a/youtube_dl/extractor/nzz.py +++ b/youtube_dl/extractor/nzz.py @@ -4,9 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - extract_attributes, -) +from ..utils import extract_attributes class NZZIE(InfoExtractor): diff --git a/youtube_dl/extractor/odatv.py b/youtube_dl/extractor/odatv.py index 314527f98..7982edaed 100644 --- a/youtube_dl/extractor/odatv.py +++ b/youtube_dl/extractor/odatv.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - NO_DEFAULT, - remove_start -) +from ..utils import NO_DEFAULT, ExtractorError, remove_start class OdaTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/odnoklassniki.py b/youtube_dl/extractor/odnoklassniki.py index 7ed9fac55..6a062042e 100644 --- a/youtube_dl/extractor/odnoklassniki.py +++ b/youtube_dl/extractor/odnoklassniki.py @@ -12,10 +12,10 @@ from ..compat import ( ) from ..utils import ( ExtractorError, - unified_strdate, int_or_none, qualities, unescapeHTML, + unified_strdate, urlencode_postdata, ) diff --git a/youtube_dl/extractor/ondemandkorea.py b/youtube_dl/extractor/ondemandkorea.py index df1ce3c1d..f9609d108 100644 --- a/youtube_dl/extractor/ondemandkorea.py +++ b/youtube_dl/extractor/ondemandkorea.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - js_to_json, -) +from ..utils import ExtractorError, js_to_json class OnDemandKoreaIE(InfoExtractor): diff --git a/youtube_dl/extractor/onet.py b/youtube_dl/extractor/onet.py index e55b2ac89..e23825470 100644 --- a/youtube_dl/extractor/onet.py +++ b/youtube_dl/extractor/onet.py @@ -5,13 +5,13 @@ import re from .common import InfoExtractor from ..utils import ( - determine_ext, + NO_DEFAULT, ExtractorError, + determine_ext, float_or_none, get_element_by_class, int_or_none, js_to_json, - NO_DEFAULT, parse_iso8601, remove_start, strip_or_none, diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dl/extractor/ooyala.py index eb957b8fe..535f5a39c 100644 --- a/youtube_dl/extractor/ooyala.py +++ b/youtube_dl/extractor/ooyala.py @@ -4,13 +4,10 @@ import base64 import re from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_str, -) +from ..compat import compat_b64decode, compat_str from ..utils import ( - determine_ext, ExtractorError, + determine_ext, float_or_none, int_or_none, try_get, diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index b05d60435..597363239 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -6,14 +6,11 @@ import os import subprocess import tempfile -from ..compat import ( - compat_urlparse, - compat_kwargs, -) +from ..compat import compat_kwargs, compat_urlparse from ..utils import ( + ExtractorError, check_executable, encodeArgument, - ExtractorError, get_exe_version, is_outdated_version, process_communicate_or_kill, diff --git a/youtube_dl/extractor/ora.py b/youtube_dl/extractor/ora.py index 1d42be39b..d6e5bc498 100644 --- a/youtube_dl/extractor/ora.py +++ b/youtube_dl/extractor/ora.py @@ -2,13 +2,10 @@ from __future__ import unicode_literals import re + from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - get_element_by_attribute, - qualities, - unescapeHTML, -) +from ..utils import get_element_by_attribute, qualities, unescapeHTML class OraTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/orf.py b/youtube_dl/extractor/orf.py index 8d537d7ae..41542151d 100644 --- a/youtube_dl/extractor/orf.py +++ b/youtube_dl/extractor/orf.py @@ -6,10 +6,10 @@ import re from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + HEADRequest, clean_html, determine_ext, float_or_none, - HEADRequest, int_or_none, orderedSet, remove_end, diff --git a/youtube_dl/extractor/packtpub.py b/youtube_dl/extractor/packtpub.py index 11ad3b3b8..d791be4dd 100644 --- a/youtube_dl/extractor/packtpub.py +++ b/youtube_dl/extractor/packtpub.py @@ -4,18 +4,13 @@ import json import re from .common import InfoExtractor -from ..compat import ( - # compat_str, - compat_HTTPError, -) -from ..utils import ( - clean_html, +from ..compat import compat_HTTPError # compat_str, +from ..utils import ( # remove_end,; urljoin, ExtractorError, - # remove_end, + clean_html, str_or_none, strip_or_none, unified_timestamp, - # urljoin, ) diff --git a/youtube_dl/extractor/palcomp3.py b/youtube_dl/extractor/palcomp3.py index fb29d83f9..522a115c0 100644 --- a/youtube_dl/extractor/palcomp3.py +++ b/youtube_dl/extractor/palcomp3.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - str_or_none, - try_get, -) +from ..utils import int_or_none, str_or_none, try_get class PalcoMP3BaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/pandoratv.py b/youtube_dl/extractor/pandoratv.py index 538738c09..cc3fc6faa 100644 --- a/youtube_dl/extractor/pandoratv.py +++ b/youtube_dl/extractor/pandoratv.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( ExtractorError, float_or_none, diff --git a/youtube_dl/extractor/patreon.py b/youtube_dl/extractor/patreon.py index 761a4b1de..062865c03 100644 --- a/youtube_dl/extractor/patreon.py +++ b/youtube_dl/extractor/patreon.py @@ -3,10 +3,10 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( + KNOWN_EXTENSIONS, clean_html, determine_ext, int_or_none, - KNOWN_EXTENSIONS, mimetype2ext, parse_iso8601, str_or_none, diff --git a/youtube_dl/extractor/pbs.py b/youtube_dl/extractor/pbs.py index d4baa16ee..966d256bf 100644 --- a/youtube_dl/extractor/pbs.py +++ b/youtube_dl/extractor/pbs.py @@ -6,17 +6,17 @@ import re from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + US_RATINGS, ExtractorError, determine_ext, - int_or_none, float_or_none, + int_or_none, js_to_json, orderedSet, strip_jsonp, strip_or_none, unified_strdate, url_or_none, - US_RATINGS, ) diff --git a/youtube_dl/extractor/pearvideo.py b/youtube_dl/extractor/pearvideo.py index 1d777221c..ccd03b578 100644 --- a/youtube_dl/extractor/pearvideo.py +++ b/youtube_dl/extractor/pearvideo.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - qualities, - unified_timestamp, -) +from ..utils import qualities, unified_timestamp class PearVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/periscope.py b/youtube_dl/extractor/periscope.py index b93a02b7d..0427bfb0b 100644 --- a/youtube_dl/extractor/periscope.py +++ b/youtube_dl/extractor/periscope.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, - unescapeHTML, -) +from ..utils import int_or_none, parse_iso8601, unescapeHTML class PeriscopeBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/philharmoniedeparis.py b/youtube_dl/extractor/philharmoniedeparis.py index 03da64b11..7b703524e 100644 --- a/youtube_dl/extractor/philharmoniedeparis.py +++ b/youtube_dl/extractor/philharmoniedeparis.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - try_get, - urljoin, -) +from ..utils import try_get, urljoin class PhilharmonieDeParisIE(InfoExtractor): diff --git a/youtube_dl/extractor/picarto.py b/youtube_dl/extractor/picarto.py index e6c51e16b..22b4e8b55 100644 --- a/youtube_dl/extractor/picarto.py +++ b/youtube_dl/extractor/picarto.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - js_to_json, -) +from ..utils import ExtractorError, js_to_json class PicartoIE(InfoExtractor): diff --git a/youtube_dl/extractor/piksel.py b/youtube_dl/extractor/piksel.py index ecf56ff8f..3883a7e57 100644 --- a/youtube_dl/extractor/piksel.py +++ b/youtube_dl/extractor/piksel.py @@ -6,8 +6,8 @@ import re from .common import InfoExtractor from ..compat import compat_str from ..utils import ( - dict_get, ExtractorError, + dict_get, int_or_none, parse_iso8601, try_get, diff --git a/youtube_dl/extractor/pladform.py b/youtube_dl/extractor/pladform.py index e86c65396..6ac107312 100644 --- a/youtube_dl/extractor/pladform.py +++ b/youtube_dl/extractor/pladform.py @@ -6,11 +6,11 @@ import re from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, - xpath_text, qualities, + xpath_text, ) diff --git a/youtube_dl/extractor/platzi.py b/youtube_dl/extractor/platzi.py index 23c8256b5..c36a592e8 100644 --- a/youtube_dl/extractor/platzi.py +++ b/youtube_dl/extractor/platzi.py @@ -2,13 +2,10 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_str, -) +from ..compat import compat_b64decode, compat_str from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, str_or_none, try_get, diff --git a/youtube_dl/extractor/playfm.py b/youtube_dl/extractor/playfm.py index e766ccca3..5ffec1b43 100644 --- a/youtube_dl/extractor/playfm.py +++ b/youtube_dl/extractor/playfm.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) +from ..utils import ExtractorError, int_or_none, parse_iso8601 class PlayFMIE(InfoExtractor): diff --git a/youtube_dl/extractor/playplustv.py b/youtube_dl/extractor/playplustv.py index 1e30ab23a..2f26545db 100644 --- a/youtube_dl/extractor/playplustv.py +++ b/youtube_dl/extractor/playplustv.py @@ -6,12 +6,7 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - clean_html, - ExtractorError, - int_or_none, - PUTRequest, -) +from ..utils import ExtractorError, PUTRequest, clean_html, int_or_none class PlayPlusTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/playstuff.py b/youtube_dl/extractor/playstuff.py index 5a329957f..6c0976582 100644 --- a/youtube_dl/extractor/playstuff.py +++ b/youtube_dl/extractor/playstuff.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - smuggle_url, - try_get, -) +from ..utils import smuggle_url, try_get class PlayStuffIE(InfoExtractor): diff --git a/youtube_dl/extractor/playtvak.py b/youtube_dl/extractor/playtvak.py index 4c5f57919..4d209b618 100644 --- a/youtube_dl/extractor/playtvak.py +++ b/youtube_dl/extractor/playtvak.py @@ -2,16 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_urlparse, - compat_urllib_parse_urlencode, -) -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, - qualities, -) +from ..compat import compat_urllib_parse_urlencode, compat_urlparse +from ..utils import ExtractorError, int_or_none, parse_iso8601, qualities class PlaytvakIE(InfoExtractor): diff --git a/youtube_dl/extractor/playvid.py b/youtube_dl/extractor/playvid.py index 4aef186ea..3d894f0e8 100644 --- a/youtube_dl/extractor/playvid.py +++ b/youtube_dl/extractor/playvid.py @@ -7,10 +7,7 @@ from ..compat import ( compat_urllib_parse_unquote, compat_urllib_parse_unquote_plus, ) -from ..utils import ( - clean_html, - ExtractorError, -) +from ..utils import ExtractorError, clean_html class PlayvidIE(InfoExtractor): diff --git a/youtube_dl/extractor/playwire.py b/youtube_dl/extractor/playwire.py index 4d96a10a7..5125cc1d8 100644 --- a/youtube_dl/extractor/playwire.py +++ b/youtube_dl/extractor/playwire.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - dict_get, - float_or_none, -) +from ..utils import dict_get, float_or_none class PlaywireIE(InfoExtractor): diff --git a/youtube_dl/extractor/pluralsight.py b/youtube_dl/extractor/pluralsight.py index 2d63855df..7d7027a3a 100644 --- a/youtube_dl/extractor/pluralsight.py +++ b/youtube_dl/extractor/pluralsight.py @@ -7,13 +7,10 @@ import random import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - dict_get, ExtractorError, + dict_get, float_or_none, int_or_none, parse_duration, diff --git a/youtube_dl/extractor/pokemon.py b/youtube_dl/extractor/pokemon.py index 80222d428..c1e412ab5 100644 --- a/youtube_dl/extractor/pokemon.py +++ b/youtube_dl/extractor/pokemon.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - extract_attributes, - int_or_none, -) +from ..utils import extract_attributes, int_or_none class PokemonIE(InfoExtractor): diff --git a/youtube_dl/extractor/polskieradio.py b/youtube_dl/extractor/polskieradio.py index 978d6f813..b09d68bc9 100644 --- a/youtube_dl/extractor/polskieradio.py +++ b/youtube_dl/extractor/polskieradio.py @@ -5,11 +5,7 @@ import itertools import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_unquote, - compat_urlparse -) +from ..compat import compat_str, compat_urllib_parse_unquote, compat_urlparse from ..utils import ( extract_attributes, int_or_none, diff --git a/youtube_dl/extractor/popcorntimes.py b/youtube_dl/extractor/popcorntimes.py index 7bf7f9858..71ac3404b 100644 --- a/youtube_dl/extractor/popcorntimes.py +++ b/youtube_dl/extractor/popcorntimes.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_chr, -) +from ..compat import compat_b64decode, compat_chr from ..utils import int_or_none diff --git a/youtube_dl/extractor/popcorntv.py b/youtube_dl/extractor/popcorntv.py index 9f834fb6c..c0b46e745 100644 --- a/youtube_dl/extractor/popcorntv.py +++ b/youtube_dl/extractor/popcorntv.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - extract_attributes, - int_or_none, - unified_timestamp, -) +from ..utils import extract_attributes, int_or_none, unified_timestamp class PopcornTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/porn91.py b/youtube_dl/extractor/porn91.py index 20eac647a..4dcc6a273 100644 --- a/youtube_dl/extractor/porn91.py +++ b/youtube_dl/extractor/porn91.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, - ExtractorError, -) +from ..utils import ExtractorError, int_or_none, parse_duration class Porn91IE(InfoExtractor): diff --git a/youtube_dl/extractor/porncom.py b/youtube_dl/extractor/porncom.py index 5726cab3a..6fde91685 100644 --- a/youtube_dl/extractor/porncom.py +++ b/youtube_dl/extractor/porncom.py @@ -4,12 +4,7 @@ import re from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - js_to_json, - parse_filesize, - str_to_int, -) +from ..utils import int_or_none, js_to_json, parse_filesize, str_to_int class PornComIE(InfoExtractor): diff --git a/youtube_dl/extractor/pornhd.py b/youtube_dl/extractor/pornhd.py index c6052ac9f..065debe21 100644 --- a/youtube_dl/extractor/pornhd.py +++ b/youtube_dl/extractor/pornhd.py @@ -4,8 +4,8 @@ import re from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, js_to_json, merge_dicts, diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py index e2e1500ff..8929f9ce8 100644 --- a/youtube_dl/extractor/pornhub.py +++ b/youtube_dl/extractor/pornhub.py @@ -7,24 +7,20 @@ import operator import re from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, - compat_urllib_request, -) from .openload import PhantomJSwrapper +from ..compat import compat_HTTPError, compat_str, compat_urllib_request from ..utils import ( - determine_ext, + NO_DEFAULT, ExtractorError, + determine_ext, int_or_none, merge_dicts, - NO_DEFAULT, orderedSet, remove_quotes, str_to_int, update_url_query, - urlencode_postdata, url_or_none, + urlencode_postdata, ) diff --git a/youtube_dl/extractor/pornovoisines.py b/youtube_dl/extractor/pornovoisines.py index b6b71069d..ee8b8952f 100644 --- a/youtube_dl/extractor/pornovoisines.py +++ b/youtube_dl/extractor/pornovoisines.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, - unified_strdate, -) +from ..utils import float_or_none, int_or_none, unified_strdate class PornoVoisinesIE(InfoExtractor): diff --git a/youtube_dl/extractor/pornoxo.py b/youtube_dl/extractor/pornoxo.py index 2831368b6..8df06abc6 100644 --- a/youtube_dl/extractor/pornoxo.py +++ b/youtube_dl/extractor/pornoxo.py @@ -3,9 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - str_to_int, -) +from ..utils import str_to_int class PornoXOIE(InfoExtractor): diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index e47088292..2e3656790 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re - from hashlib import sha1 + from .common import InfoExtractor from ..compat import compat_str from ..utils import ( diff --git a/youtube_dl/extractor/puhutv.py b/youtube_dl/extractor/puhutv.py index ca71665e0..5a4ad2b7b 100644 --- a/youtube_dl/extractor/puhutv.py +++ b/youtube_dl/extractor/puhutv.py @@ -2,14 +2,11 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( ExtractorError, - int_or_none, float_or_none, + int_or_none, parse_resolution, str_or_none, try_get, diff --git a/youtube_dl/extractor/puls4.py b/youtube_dl/extractor/puls4.py index 80091b85f..127b240a1 100644 --- a/youtube_dl/extractor/puls4.py +++ b/youtube_dl/extractor/puls4.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .prosiebensat1 import ProSiebenSat1BaseIE -from ..utils import ( - unified_strdate, - parse_duration, - compat_str, -) +from ..utils import compat_str, parse_duration, unified_strdate class Puls4IE(ProSiebenSat1BaseIE): diff --git a/youtube_dl/extractor/qqmusic.py b/youtube_dl/extractor/qqmusic.py index 084308aeb..0623306df 100644 --- a/youtube_dl/extractor/qqmusic.py +++ b/youtube_dl/extractor/qqmusic.py @@ -6,12 +6,7 @@ import re import time from .common import InfoExtractor -from ..utils import ( - clean_html, - ExtractorError, - strip_jsonp, - unescapeHTML, -) +from ..utils import ExtractorError, clean_html, strip_jsonp, unescapeHTML class QQMusicIE(InfoExtractor): diff --git a/youtube_dl/extractor/radiocanada.py b/youtube_dl/extractor/radiocanada.py index a28b1a24c..25061a1f2 100644 --- a/youtube_dl/extractor/radiocanada.py +++ b/youtube_dl/extractor/radiocanada.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - determine_ext, - ExtractorError, - int_or_none, - unified_strdate, -) +from ..utils import ExtractorError, determine_ext, int_or_none, unified_strdate class RadioCanadaIE(InfoExtractor): diff --git a/youtube_dl/extractor/rai.py b/youtube_dl/extractor/rai.py index 563d3400f..dc9ed30a1 100644 --- a/youtube_dl/extractor/rai.py +++ b/youtube_dl/extractor/rai.py @@ -4,17 +4,14 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - determine_ext, ExtractorError, - find_xpath_attr, - fix_xml_ampersands, GeoRestrictedError, HEADRequest, + determine_ext, + find_xpath_attr, + fix_xml_ampersands, int_or_none, parse_duration, remove_start, diff --git a/youtube_dl/extractor/rbmaradio.py b/youtube_dl/extractor/rbmaradio.py index ae7413fb5..bc3f950ae 100644 --- a/youtube_dl/extractor/rbmaradio.py +++ b/youtube_dl/extractor/rbmaradio.py @@ -4,12 +4,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - clean_html, - int_or_none, - unified_timestamp, - update_url_query, -) +from ..utils import clean_html, int_or_none, unified_timestamp, update_url_query class RBMARadioIE(InfoExtractor): diff --git a/youtube_dl/extractor/rds.py b/youtube_dl/extractor/rds.py index 0c497856e..18efd5390 100644 --- a/youtube_dl/extractor/rds.py +++ b/youtube_dl/extractor/rds.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, - js_to_json, -) from ..compat import compat_str +from ..utils import js_to_json, parse_duration, parse_iso8601 class RDSIE(InfoExtractor): diff --git a/youtube_dl/extractor/redbulltv.py b/youtube_dl/extractor/redbulltv.py index 6d000b372..afd588e63 100644 --- a/youtube_dl/extractor/redbulltv.py +++ b/youtube_dl/extractor/redbulltv.py @@ -5,10 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - float_or_none, - ExtractorError, -) +from ..utils import ExtractorError, float_or_none class RedBullTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/reddit.py b/youtube_dl/extractor/reddit.py index 222fa0172..fc9792078 100644 --- a/youtube_dl/extractor/reddit.py +++ b/youtube_dl/extractor/reddit.py @@ -5,8 +5,8 @@ import re from .common import InfoExtractor from ..utils import ( ExtractorError, - int_or_none, float_or_none, + int_or_none, try_get, unescapeHTML, url_or_none, diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index a1ca791ca..d6a6b7f6f 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -4,8 +4,8 @@ import re from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, merge_dicts, str_to_int, diff --git a/youtube_dl/extractor/regiotv.py b/youtube_dl/extractor/regiotv.py index e250a52f0..bdbcc530e 100644 --- a/youtube_dl/extractor/regiotv.py +++ b/youtube_dl/extractor/regiotv.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor - -from ..utils import ( - sanitized_Request, - xpath_text, - xpath_with_ns, -) +from ..utils import sanitized_Request, xpath_text, xpath_with_ns class RegioTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/rentv.py b/youtube_dl/extractor/rentv.py index 7c8909d95..2b2e0e8af 100644 --- a/youtube_dl/extractor/rentv.py +++ b/youtube_dl/extractor/rentv.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - determine_ext, - int_or_none, - url_or_none, -) +from ..utils import determine_ext, int_or_none, url_or_none class RENTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/reuters.py b/youtube_dl/extractor/reuters.py index 9dc482d21..f37607c86 100644 --- a/youtube_dl/extractor/reuters.py +++ b/youtube_dl/extractor/reuters.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - js_to_json, - int_or_none, - unescapeHTML, -) +from ..utils import int_or_none, js_to_json, unescapeHTML class ReutersIE(InfoExtractor): diff --git a/youtube_dl/extractor/reverbnation.py b/youtube_dl/extractor/reverbnation.py index 4cb99c244..e5b5968e8 100644 --- a/youtube_dl/extractor/reverbnation.py +++ b/youtube_dl/extractor/reverbnation.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - qualities, - str_or_none, -) +from ..utils import qualities, str_or_none class ReverbNationIE(InfoExtractor): diff --git a/youtube_dl/extractor/rice.py b/youtube_dl/extractor/rice.py index f855719ac..f5570e626 100644 --- a/youtube_dl/extractor/rice.py +++ b/youtube_dl/extractor/rice.py @@ -6,11 +6,11 @@ import re from .common import InfoExtractor from ..compat import compat_parse_qs from ..utils import ( - xpath_text, - xpath_element, + ExtractorError, int_or_none, parse_iso8601, - ExtractorError, + xpath_element, + xpath_text, ) diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dl/extractor/rmcdecouverte.py index c3623edcc..bf91195b6 100644 --- a/youtube_dl/extractor/rmcdecouverte.py +++ b/youtube_dl/extractor/rmcdecouverte.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from .brightcove import BrightcoveLegacyIE -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) +from .common import InfoExtractor +from ..compat import compat_parse_qs, compat_urlparse from ..utils import smuggle_url diff --git a/youtube_dl/extractor/rockstargames.py b/youtube_dl/extractor/rockstargames.py index cd6904bc9..7ea4ab9a1 100644 --- a/youtube_dl/extractor/rockstargames.py +++ b/youtube_dl/extractor/rockstargames.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) +from ..utils import int_or_none, parse_iso8601 class RockstarGamesIE(InfoExtractor): diff --git a/youtube_dl/extractor/roosterteeth.py b/youtube_dl/extractor/roosterteeth.py index 8883639b2..d94336feb 100644 --- a/youtube_dl/extractor/roosterteeth.py +++ b/youtube_dl/extractor/roosterteeth.py @@ -2,16 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) -from ..utils import ( - ExtractorError, - int_or_none, - str_or_none, - urlencode_postdata, -) +from ..compat import compat_HTTPError, compat_str +from ..utils import ExtractorError, int_or_none, str_or_none, urlencode_postdata class RoosterTeethIE(InfoExtractor): diff --git a/youtube_dl/extractor/roxwel.py b/youtube_dl/extractor/roxwel.py index 65284643b..d22e50037 100644 --- a/youtube_dl/extractor/roxwel.py +++ b/youtube_dl/extractor/roxwel.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import unified_strdate, determine_ext +from ..utils import determine_ext, unified_strdate class RoxwelIE(InfoExtractor): diff --git a/youtube_dl/extractor/rozhlas.py b/youtube_dl/extractor/rozhlas.py index fccf69401..45ada583c 100644 --- a/youtube_dl/extractor/rozhlas.py +++ b/youtube_dl/extractor/rozhlas.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - remove_start, -) +from ..utils import int_or_none, remove_start class RozhlasIE(InfoExtractor): diff --git a/youtube_dl/extractor/rtbf.py b/youtube_dl/extractor/rtbf.py index 3b0f3080b..51d931cfe 100644 --- a/youtube_dl/extractor/rtbf.py +++ b/youtube_dl/extractor/rtbf.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - float_or_none, - int_or_none, - strip_or_none, -) +from ..utils import ExtractorError, float_or_none, int_or_none, strip_or_none class RTBFIE(InfoExtractor): diff --git a/youtube_dl/extractor/rte.py b/youtube_dl/extractor/rte.py index 1fbc72915..1a444e665 100644 --- a/youtube_dl/extractor/rte.py +++ b/youtube_dl/extractor/rte.py @@ -6,13 +6,13 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( + ExtractorError, float_or_none, parse_iso8601, str_or_none, try_get, unescapeHTML, url_or_none, - ExtractorError, ) diff --git a/youtube_dl/extractor/rtl2.py b/youtube_dl/extractor/rtl2.py index 70f000ca8..a5f80db51 100644 --- a/youtube_dl/extractor/rtl2.py +++ b/youtube_dl/extractor/rtl2.py @@ -5,16 +5,12 @@ import re from .common import InfoExtractor from ..aes import aes_cbc_decrypt -from ..compat import ( - compat_b64decode, - compat_ord, - compat_str, -) +from ..compat import compat_b64decode, compat_ord, compat_str from ..utils import ( - bytes_to_intlist, ExtractorError, - intlist_to_bytes, + bytes_to_intlist, int_or_none, + intlist_to_bytes, strip_or_none, ) diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index 9eaa06f25..980a2a2e9 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, -) +from ..utils import int_or_none, parse_duration class RtlNlIE(InfoExtractor): diff --git a/youtube_dl/extractor/rtp.py b/youtube_dl/extractor/rtp.py index 02986f442..c83347bbf 100644 --- a/youtube_dl/extractor/rtp.py +++ b/youtube_dl/extractor/rtp.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - js_to_json, -) +from ..utils import determine_ext, js_to_json class RTPIE(InfoExtractor): diff --git a/youtube_dl/extractor/rtve.py b/youtube_dl/extractor/rtve.py index d2fb754cf..2994f2ca2 100644 --- a/youtube_dl/extractor/rtve.py +++ b/youtube_dl/extractor/rtve.py @@ -7,13 +7,10 @@ import re import sys from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_struct_unpack, -) +from ..compat import compat_b64decode, compat_struct_unpack from ..utils import ( - determine_ext, ExtractorError, + determine_ext, float_or_none, qualities, remove_end, diff --git a/youtube_dl/extractor/rumble.py b/youtube_dl/extractor/rumble.py index 4a0225109..dc41b1535 100644 --- a/youtube_dl/extractor/rumble.py +++ b/youtube_dl/extractor/rumble.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - determine_ext, - int_or_none, - parse_iso8601, - try_get, -) +from ..utils import determine_ext, int_or_none, parse_iso8601, try_get class RumbleEmbedIE(InfoExtractor): diff --git a/youtube_dl/extractor/rutube.py b/youtube_dl/extractor/rutube.py index 8f54d5675..221d48d3e 100644 --- a/youtube_dl/extractor/rutube.py +++ b/youtube_dl/extractor/rutube.py @@ -1,18 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -import re import itertools +import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_parse_qs, - compat_urllib_parse_urlparse, -) +from ..compat import compat_parse_qs, compat_str, compat_urllib_parse_urlparse from ..utils import ( - determine_ext, bool_or_none, + determine_ext, int_or_none, try_get, unified_timestamp, diff --git a/youtube_dl/extractor/rutv.py b/youtube_dl/extractor/rutv.py index 05f319396..f753b3756 100644 --- a/youtube_dl/extractor/rutv.py +++ b/youtube_dl/extractor/rutv.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - str_to_int -) +from ..utils import ExtractorError, int_or_none, str_to_int class RUTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/ruutu.py b/youtube_dl/extractor/ruutu.py index c50cd3ecd..303367ed3 100644 --- a/youtube_dl/extractor/ruutu.py +++ b/youtube_dl/extractor/ruutu.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_urllib_parse_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, find_xpath_attr, int_or_none, unified_strdate, diff --git a/youtube_dl/extractor/ruv.py b/youtube_dl/extractor/ruv.py index 8f3cc4095..9a8548ae3 100644 --- a/youtube_dl/extractor/ruv.py +++ b/youtube_dl/extractor/ruv.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - unified_timestamp, -) +from ..utils import determine_ext, unified_timestamp class RuvIE(InfoExtractor): diff --git a/youtube_dl/extractor/safari.py b/youtube_dl/extractor/safari.py index 2cc665122..cc3a371c2 100644 --- a/youtube_dl/extractor/safari.py +++ b/youtube_dl/extractor/safari.py @@ -5,15 +5,8 @@ import json import re from .common import InfoExtractor - -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) -from ..utils import ( - ExtractorError, - update_url_query, -) +from ..compat import compat_parse_qs, compat_urlparse +from ..utils import ExtractorError, update_url_query class SafariBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/samplefocus.py b/youtube_dl/extractor/samplefocus.py index 806c3c354..40e486bb4 100644 --- a/youtube_dl/extractor/samplefocus.py +++ b/youtube_dl/extractor/samplefocus.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - extract_attributes, - get_element_by_attribute, - int_or_none, -) +from ..utils import extract_attributes, get_element_by_attribute, int_or_none class SampleFocusIE(InfoExtractor): diff --git a/youtube_dl/extractor/sapo.py b/youtube_dl/extractor/sapo.py index 49a9b313a..51784a9bd 100644 --- a/youtube_dl/extractor/sapo.py +++ b/youtube_dl/extractor/sapo.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - parse_duration, - unified_strdate, -) +from ..utils import parse_duration, unified_strdate class SapoIE(InfoExtractor): diff --git a/youtube_dl/extractor/sbs.py b/youtube_dl/extractor/sbs.py index 0a806ee4e..e356f223d 100644 --- a/youtube_dl/extractor/sbs.py +++ b/youtube_dl/extractor/sbs.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - smuggle_url, - ExtractorError, -) +from ..utils import ExtractorError, smuggle_url class SBSIE(InfoExtractor): diff --git a/youtube_dl/extractor/screencast.py b/youtube_dl/extractor/screencast.py index 69a0d01f3..c19ba9234 100644 --- a/youtube_dl/extractor/screencast.py +++ b/youtube_dl/extractor/screencast.py @@ -2,13 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_request, -) -from ..utils import ( - ExtractorError, -) +from ..compat import compat_parse_qs, compat_urllib_request +from ..utils import ExtractorError class ScreencastIE(InfoExtractor): diff --git a/youtube_dl/extractor/scrippsnetworks.py b/youtube_dl/extractor/scrippsnetworks.py index b40b4c4af..79b1779c8 100644 --- a/youtube_dl/extractor/scrippsnetworks.py +++ b/youtube_dl/extractor/scrippsnetworks.py @@ -1,18 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -import json import hashlib +import json import re -from .aws import AWSIE from .anvato import AnvatoIE +from .aws import AWSIE from .common import InfoExtractor -from ..utils import ( - smuggle_url, - urlencode_postdata, - xpath_text, -) +from ..utils import smuggle_url, urlencode_postdata, xpath_text class ScrippsNetworksWatchIE(AWSIE): diff --git a/youtube_dl/extractor/scte.py b/youtube_dl/extractor/scte.py index ca1de63b6..addab7080 100644 --- a/youtube_dl/extractor/scte.py +++ b/youtube_dl/extractor/scte.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - decode_packed_codes, - ExtractorError, - urlencode_postdata, -) +from ..utils import ExtractorError, decode_packed_codes, urlencode_postdata class SCTEBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/seeker.py b/youtube_dl/extractor/seeker.py index 7872dc80d..a47722771 100644 --- a/youtube_dl/extractor/seeker.py +++ b/youtube_dl/extractor/seeker.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - get_element_by_class, - strip_or_none, -) +from ..utils import get_element_by_class, strip_or_none class SeekerIE(InfoExtractor): diff --git a/youtube_dl/extractor/senateisvp.py b/youtube_dl/extractor/senateisvp.py index db5ef8b57..4ce0052bc 100644 --- a/youtube_dl/extractor/senateisvp.py +++ b/youtube_dl/extractor/senateisvp.py @@ -2,15 +2,10 @@ from __future__ import unicode_literals import re + from .common import InfoExtractor -from ..utils import ( - ExtractorError, - unsmuggle_url, -) -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) +from ..compat import compat_parse_qs, compat_urlparse +from ..utils import ExtractorError, unsmuggle_url class SenateISVPIE(InfoExtractor): diff --git a/youtube_dl/extractor/sendtonews.py b/youtube_dl/extractor/sendtonews.py index 9d9652949..47cc48edd 100644 --- a/youtube_dl/extractor/sendtonews.py +++ b/youtube_dl/extractor/sendtonews.py @@ -5,12 +5,12 @@ import re from .common import InfoExtractor from ..utils import ( - float_or_none, - parse_iso8601, - update_url_query, - int_or_none, determine_protocol, + float_or_none, + int_or_none, + parse_iso8601, unescapeHTML, + update_url_query, ) diff --git a/youtube_dl/extractor/servus.py b/youtube_dl/extractor/servus.py index 1610ddc2c..aa6600813 100644 --- a/youtube_dl/extractor/servus.py +++ b/youtube_dl/extractor/servus.py @@ -7,8 +7,8 @@ from ..utils import ( float_or_none, int_or_none, unified_timestamp, - urlencode_postdata, url_or_none, + urlencode_postdata, ) diff --git a/youtube_dl/extractor/sevenplus.py b/youtube_dl/extractor/sevenplus.py index 240afc18f..4075f4f19 100644 --- a/youtube_dl/extractor/sevenplus.py +++ b/youtube_dl/extractor/sevenplus.py @@ -4,15 +4,8 @@ from __future__ import unicode_literals import re from .brightcove import BrightcoveNewIE -from ..compat import ( - compat_HTTPError, - compat_str, -) -from ..utils import ( - ExtractorError, - try_get, - update_url_query, -) +from ..compat import compat_HTTPError, compat_str +from ..utils import ExtractorError, try_get, update_url_query class SevenPlusIE(BrightcoveNewIE): diff --git a/youtube_dl/extractor/seznamzpravy.py b/youtube_dl/extractor/seznamzpravy.py index 7a1c7e38b..8ed20a6b2 100644 --- a/youtube_dl/extractor/seznamzpravy.py +++ b/youtube_dl/extractor/seznamzpravy.py @@ -4,17 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_str, - compat_urllib_parse_urlparse, -) -from ..utils import ( - urljoin, - int_or_none, - parse_codecs, - try_get, -) +from ..compat import compat_parse_qs, compat_str, compat_urllib_parse_urlparse +from ..utils import int_or_none, parse_codecs, try_get, urljoin def _raw_id(src_url): diff --git a/youtube_dl/extractor/shahid.py b/youtube_dl/extractor/shahid.py index 88b938e05..f5621488d 100644 --- a/youtube_dl/extractor/shahid.py +++ b/youtube_dl/extractor/shahid.py @@ -8,9 +8,9 @@ import re from .aws import AWSIE from ..compat import compat_HTTPError from ..utils import ( - clean_html, ExtractorError, InAdvancePagedList, + clean_html, int_or_none, parse_iso8601, str_or_none, diff --git a/youtube_dl/extractor/shared.py b/youtube_dl/extractor/shared.py index 93ab2a167..fcfcbdd17 100644 --- a/youtube_dl/extractor/shared.py +++ b/youtube_dl/extractor/shared.py @@ -1,16 +1,13 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_b64decode, - compat_urllib_parse_unquote_plus, -) +from ..compat import compat_b64decode, compat_urllib_parse_unquote_plus from ..utils import ( - determine_ext, + KNOWN_EXTENSIONS, ExtractorError, + determine_ext, int_or_none, js_to_json, - KNOWN_EXTENSIONS, parse_filesize, rot47, url_or_none, diff --git a/youtube_dl/extractor/showroomlive.py b/youtube_dl/extractor/showroomlive.py index efd9d561f..8c99775bc 100644 --- a/youtube_dl/extractor/showroomlive.py +++ b/youtube_dl/extractor/showroomlive.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - urljoin, -) +from ..utils import ExtractorError, int_or_none, urljoin class ShowRoomLiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/sina.py b/youtube_dl/extractor/sina.py index 07b766b4a..c5360227e 100644 --- a/youtube_dl/extractor/sina.py +++ b/youtube_dl/extractor/sina.py @@ -5,13 +5,13 @@ import re from .common import InfoExtractor from ..utils import ( - HEADRequest, ExtractorError, - int_or_none, - update_url_query, - qualities, - get_element_by_attribute, + HEADRequest, clean_html, + get_element_by_attribute, + int_or_none, + qualities, + update_url_query, ) diff --git a/youtube_dl/extractor/sixplay.py b/youtube_dl/extractor/sixplay.py index 7ec66ecf3..2f5eda874 100644 --- a/youtube_dl/extractor/sixplay.py +++ b/youtube_dl/extractor/sixplay.py @@ -4,17 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_str, - compat_urllib_parse_urlparse, -) -from ..utils import ( - determine_ext, - int_or_none, - try_get, - qualities, -) +from ..compat import compat_parse_qs, compat_str, compat_urllib_parse_urlparse +from ..utils import determine_ext, int_or_none, qualities, try_get class SixPlayIE(InfoExtractor): diff --git a/youtube_dl/extractor/sky.py b/youtube_dl/extractor/sky.py index ff2c977a0..5d04b24c8 100644 --- a/youtube_dl/extractor/sky.py +++ b/youtube_dl/extractor/sky.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - extract_attributes, - smuggle_url, - strip_or_none, - urljoin, -) +from ..utils import extract_attributes, smuggle_url, strip_or_none, urljoin class SkyBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/skyit.py b/youtube_dl/extractor/skyit.py index 14a4d8d4c..335b99d6b 100644 --- a/youtube_dl/extractor/skyit.py +++ b/youtube_dl/extractor/skyit.py @@ -2,17 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_parse_qs, - compat_urllib_parse_urlparse, -) -from ..utils import ( - dict_get, - int_or_none, - parse_duration, - unified_timestamp, -) +from ..compat import compat_parse_qs, compat_str, compat_urllib_parse_urlparse +from ..utils import dict_get, int_or_none, parse_duration, unified_timestamp class SkyItPlayerIE(InfoExtractor): diff --git a/youtube_dl/extractor/skynewsarabia.py b/youtube_dl/extractor/skynewsarabia.py index fffc9aa22..fa4735e81 100644 --- a/youtube_dl/extractor/skynewsarabia.py +++ b/youtube_dl/extractor/skynewsarabia.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - parse_iso8601, - parse_duration, -) +from ..utils import parse_duration, parse_iso8601 class SkyNewsArabiaBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/slideshare.py b/youtube_dl/extractor/slideshare.py index e89ebebe7..83b26ea48 100644 --- a/youtube_dl/extractor/slideshare.py +++ b/youtube_dl/extractor/slideshare.py @@ -1,16 +1,11 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor -from ..compat import ( - compat_urlparse, -) -from ..utils import ( - ExtractorError, - get_element_by_id, -) +from ..compat import compat_urlparse +from ..utils import ExtractorError, get_element_by_id class SlideshareIE(InfoExtractor): diff --git a/youtube_dl/extractor/slideslive.py b/youtube_dl/extractor/slideslive.py index 9409a0100..16cbd6b80 100644 --- a/youtube_dl/extractor/slideslive.py +++ b/youtube_dl/extractor/slideslive.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - bool_or_none, - smuggle_url, - try_get, - url_or_none, -) +from ..utils import bool_or_none, smuggle_url, try_get, url_or_none class SlidesLiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/snotr.py b/youtube_dl/extractor/snotr.py index f77354748..63c54a824 100644 --- a/youtube_dl/extractor/snotr.py +++ b/youtube_dl/extractor/snotr.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_filesize, - str_to_int, -) +from ..utils import parse_duration, parse_filesize, str_to_int class SnotrIE(InfoExtractor): diff --git a/youtube_dl/extractor/sohu.py b/youtube_dl/extractor/sohu.py index a62ed84f1..659a137c4 100644 --- a/youtube_dl/extractor/sohu.py +++ b/youtube_dl/extractor/sohu.py @@ -4,15 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_urlencode, -) -from ..utils import ( - ExtractorError, - int_or_none, - try_get, -) +from ..compat import compat_str, compat_urllib_parse_urlencode +from ..utils import ExtractorError, int_or_none, try_get class SohuIE(InfoExtractor): diff --git a/youtube_dl/extractor/sonyliv.py b/youtube_dl/extractor/sonyliv.py index fedfceb62..a91fedaab 100644 --- a/youtube_dl/extractor/sonyliv.py +++ b/youtube_dl/extractor/sonyliv.py @@ -6,10 +6,7 @@ import uuid from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - ExtractorError, - int_or_none, -) +from ..utils import ExtractorError, int_or_none class SonyLIVIE(InfoExtractor): diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dl/extractor/soundcloud.py index abb85e1e5..b6375d401 100644 --- a/youtube_dl/extractor/soundcloud.py +++ b/youtube_dl/extractor/soundcloud.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import itertools import re -from .common import ( - InfoExtractor, - SearchInfoExtractor -) +from .common import InfoExtractor, SearchInfoExtractor from ..compat import ( compat_HTTPError, compat_kwargs, @@ -15,12 +12,12 @@ from ..compat import ( compat_urlparse, ) from ..utils import ( - error_to_compat_str, - ExtractorError, - float_or_none, - HEADRequest, - int_or_none, KNOWN_EXTENSIONS, + ExtractorError, + HEADRequest, + error_to_compat_str, + float_or_none, + int_or_none, mimetype2ext, str_or_none, try_get, diff --git a/youtube_dl/extractor/spankbang.py b/youtube_dl/extractor/spankbang.py index 37cb8c839..db137dc4e 100644 --- a/youtube_dl/extractor/spankbang.py +++ b/youtube_dl/extractor/spankbang.py @@ -4,8 +4,8 @@ import re from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, merge_dicts, parse_duration, parse_resolution, diff --git a/youtube_dl/extractor/sportbox.py b/youtube_dl/extractor/sportbox.py index b9017fd2a..d442d4a31 100644 --- a/youtube_dl/extractor/sportbox.py +++ b/youtube_dl/extractor/sportbox.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - js_to_json, - merge_dicts, -) +from ..utils import determine_ext, int_or_none, js_to_json, merge_dicts class SportBoxIE(InfoExtractor): diff --git a/youtube_dl/extractor/sportdeutschland.py b/youtube_dl/extractor/sportdeutschland.py index 3e497a939..709ba7cd2 100644 --- a/youtube_dl/extractor/sportdeutschland.py +++ b/youtube_dl/extractor/sportdeutschland.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse from ..utils import ( clean_html, float_or_none, diff --git a/youtube_dl/extractor/springboardplatform.py b/youtube_dl/extractor/springboardplatform.py index 07d99b579..461e9a445 100644 --- a/youtube_dl/extractor/springboardplatform.py +++ b/youtube_dl/extractor/springboardplatform.py @@ -7,11 +7,11 @@ from .common import InfoExtractor from ..utils import ( ExtractorError, int_or_none, - xpath_attr, - xpath_text, - xpath_element, unescapeHTML, unified_timestamp, + xpath_attr, + xpath_element, + xpath_text, ) diff --git a/youtube_dl/extractor/sprout.py b/youtube_dl/extractor/sprout.py index e243732f2..423d09ba8 100644 --- a/youtube_dl/extractor/sprout.py +++ b/youtube_dl/extractor/sprout.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .adobepass import AdobePassIE -from ..utils import ( - int_or_none, - smuggle_url, - update_url_query, -) +from ..utils import int_or_none, smuggle_url, update_url_query class SproutIE(AdobePassIE): diff --git a/youtube_dl/extractor/srmediathek.py b/youtube_dl/extractor/srmediathek.py index 359dadaa3..8e65f2b4a 100644 --- a/youtube_dl/extractor/srmediathek.py +++ b/youtube_dl/extractor/srmediathek.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .ard import ARDMediathekBaseIE -from ..utils import ( - ExtractorError, - get_element_by_attribute, -) +from ..utils import ExtractorError, get_element_by_attribute class SRMediathekIE(ARDMediathekBaseIE): diff --git a/youtube_dl/extractor/stanfordoc.py b/youtube_dl/extractor/stanfordoc.py index ae3dd1380..c8711300d 100644 --- a/youtube_dl/extractor/stanfordoc.py +++ b/youtube_dl/extractor/stanfordoc.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - orderedSet, - unescapeHTML, -) +from ..utils import ExtractorError, orderedSet, unescapeHTML class StanfordOpenClassroomIE(InfoExtractor): diff --git a/youtube_dl/extractor/steam.py b/youtube_dl/extractor/steam.py index a6a191ceb..1006cf8f1 100644 --- a/youtube_dl/extractor/steam.py +++ b/youtube_dl/extractor/steam.py @@ -4,8 +4,8 @@ import re from .common import InfoExtractor from ..utils import ( - extract_attributes, ExtractorError, + extract_attributes, get_element_by_class, js_to_json, ) diff --git a/youtube_dl/extractor/stitcher.py b/youtube_dl/extractor/stitcher.py index 822782507..498758215 100644 --- a/youtube_dl/extractor/stitcher.py +++ b/youtube_dl/extractor/stitcher.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + ExtractorError, clean_html, clean_podcast_url, - ExtractorError, int_or_none, str_or_none, try_get, diff --git a/youtube_dl/extractor/storyfire.py b/youtube_dl/extractor/storyfire.py index 9c698626f..de692bb83 100644 --- a/youtube_dl/extractor/storyfire.py +++ b/youtube_dl/extractor/storyfire.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import functools from .common import InfoExtractor -from ..utils import ( - # HEADRequest, - int_or_none, - OnDemandPagedList, - smuggle_url, -) +from ..utils import OnDemandPagedList, int_or_none, smuggle_url # HEADRequest, class StoryFireBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/streamable.py b/youtube_dl/extractor/streamable.py index 34725274e..1ecaae058 100644 --- a/youtube_dl/extractor/streamable.py +++ b/youtube_dl/extractor/streamable.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - float_or_none, - int_or_none, -) +from ..utils import ExtractorError, float_or_none, int_or_none class StreamableIE(InfoExtractor): diff --git a/youtube_dl/extractor/streamcloud.py b/youtube_dl/extractor/streamcloud.py index b97bb4374..42afacbdb 100644 --- a/youtube_dl/extractor/streamcloud.py +++ b/youtube_dl/extractor/streamcloud.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - urlencode_postdata, -) +from ..utils import ExtractorError, urlencode_postdata class StreamcloudIE(InfoExtractor): diff --git a/youtube_dl/extractor/sunporno.py b/youtube_dl/extractor/sunporno.py index 68051169b..2df18ddad 100644 --- a/youtube_dl/extractor/sunporno.py +++ b/youtube_dl/extractor/sunporno.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, - qualities, - determine_ext, -) +from ..utils import determine_ext, int_or_none, parse_duration, qualities class SunPornoIE(InfoExtractor): diff --git a/youtube_dl/extractor/sverigesradio.py b/youtube_dl/extractor/sverigesradio.py index aa0691f0d..44a1d10dd 100644 --- a/youtube_dl/extractor/sverigesradio.py +++ b/youtube_dl/extractor/sverigesradio.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - str_or_none, -) +from ..utils import determine_ext, int_or_none, str_or_none class SverigesRadioBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/svt.py b/youtube_dl/extractor/svt.py index a5bb6daa7..b27af190b 100644 --- a/youtube_dl/extractor/svt.py +++ b/youtube_dl/extractor/svt.py @@ -9,10 +9,10 @@ from ..utils import ( determine_ext, dict_get, int_or_none, - unified_timestamp, str_or_none, strip_or_none, try_get, + unified_timestamp, ) diff --git a/youtube_dl/extractor/swrmediathek.py b/youtube_dl/extractor/swrmediathek.py index 0f615979e..6487ff9f4 100644 --- a/youtube_dl/extractor/swrmediathek.py +++ b/youtube_dl/extractor/swrmediathek.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, - determine_protocol, -) +from ..utils import determine_protocol, int_or_none, parse_duration class SWRMediathekIE(InfoExtractor): diff --git a/youtube_dl/extractor/syfy.py b/youtube_dl/extractor/syfy.py index def7e5a2c..f47e424d4 100644 --- a/youtube_dl/extractor/syfy.py +++ b/youtube_dl/extractor/syfy.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .adobepass import AdobePassIE -from ..utils import ( - update_url_query, - smuggle_url, -) +from ..utils import smuggle_url, update_url_query class SyfyIE(AdobePassIE): diff --git a/youtube_dl/extractor/tagesschau.py b/youtube_dl/extractor/tagesschau.py index 8ceab7e35..cc74a6fe7 100644 --- a/youtube_dl/extractor/tagesschau.py +++ b/youtube_dl/extractor/tagesschau.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - js_to_json, - parse_iso8601, - parse_filesize, -) +from ..utils import determine_ext, js_to_json, parse_filesize, parse_iso8601 class TagesschauPlayerIE(InfoExtractor): diff --git a/youtube_dl/extractor/tass.py b/youtube_dl/extractor/tass.py index 6d336da78..97c583ef8 100644 --- a/youtube_dl/extractor/tass.py +++ b/youtube_dl/extractor/tass.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import json from .common import InfoExtractor -from ..utils import ( - js_to_json, - qualities, -) +from ..utils import js_to_json, qualities class TassIE(InfoExtractor): diff --git a/youtube_dl/extractor/tbs.py b/youtube_dl/extractor/tbs.py index e8a7c65e0..fa26f4f04 100644 --- a/youtube_dl/extractor/tbs.py +++ b/youtube_dl/extractor/tbs.py @@ -4,15 +4,8 @@ from __future__ import unicode_literals import re from .turner import TurnerBaseIE -from ..compat import ( - compat_urllib_parse_urlparse, - compat_parse_qs, -) -from ..utils import ( - float_or_none, - int_or_none, - strip_or_none, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse +from ..utils import float_or_none, int_or_none, strip_or_none class TBSIE(TurnerBaseIE): diff --git a/youtube_dl/extractor/teachable.py b/youtube_dl/extractor/teachable.py index 2394f86d4..7e430c97e 100644 --- a/youtube_dl/extractor/teachable.py +++ b/youtube_dl/extractor/teachable.py @@ -5,10 +5,10 @@ import re from .common import InfoExtractor from .wistia import WistiaIE from ..utils import ( - clean_html, ExtractorError, - int_or_none, + clean_html, get_element_by_class, + int_or_none, strip_or_none, urlencode_postdata, urljoin, diff --git a/youtube_dl/extractor/teachertube.py b/youtube_dl/extractor/teachertube.py index 1272078c5..2b81977fe 100644 --- a/youtube_dl/extractor/teachertube.py +++ b/youtube_dl/extractor/teachertube.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - ExtractorError, - qualities, -) +from ..utils import ExtractorError, determine_ext, qualities class TeacherTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py index 5793b711f..367867aa6 100644 --- a/youtube_dl/extractor/teamcoco.py +++ b/youtube_dl/extractor/teamcoco.py @@ -5,8 +5,8 @@ import json from .turner import TurnerBaseIE from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, mimetype2ext, parse_duration, diff --git a/youtube_dl/extractor/teamtreehouse.py b/youtube_dl/extractor/teamtreehouse.py index d347e97ef..1e1da4542 100644 --- a/youtube_dl/extractor/teamtreehouse.py +++ b/youtube_dl/extractor/teamtreehouse.py @@ -5,9 +5,9 @@ import re from .common import InfoExtractor from ..utils import ( + ExtractorError, clean_html, determine_ext, - ExtractorError, float_or_none, get_element_by_class, get_element_by_id, diff --git a/youtube_dl/extractor/techtalks.py b/youtube_dl/extractor/techtalks.py index a5b62c717..53eb6a621 100644 --- a/youtube_dl/extractor/techtalks.py +++ b/youtube_dl/extractor/techtalks.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - get_element_by_attribute, - clean_html, -) +from ..utils import clean_html, get_element_by_attribute class TechTalksIE(InfoExtractor): diff --git a/youtube_dl/extractor/ted.py b/youtube_dl/extractor/ted.py index f09f1a3f9..eb02781fc 100644 --- a/youtube_dl/extractor/ted.py +++ b/youtube_dl/extractor/ted.py @@ -4,11 +4,7 @@ import json import re from .common import InfoExtractor - -from ..compat import ( - compat_str, - compat_urlparse -) +from ..compat import compat_str, compat_urlparse from ..utils import ( extract_attributes, float_or_none, diff --git a/youtube_dl/extractor/tele13.py b/youtube_dl/extractor/tele13.py index a29a64b6d..c99902175 100644 --- a/youtube_dl/extractor/tele13.py +++ b/youtube_dl/extractor/tele13.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from .youtube import YoutubeIE -from ..utils import ( - js_to_json, - qualities, - determine_ext, -) +from ..utils import determine_ext, js_to_json, qualities class Tele13IE(InfoExtractor): diff --git a/youtube_dl/extractor/tele5.py b/youtube_dl/extractor/tele5.py index df02dfc47..ff8a29f67 100644 --- a/youtube_dl/extractor/tele5.py +++ b/youtube_dl/extractor/tele5.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from ..compat import compat_urlparse -from ..utils import ( - ExtractorError, - extract_attributes, -) - from .dplay import DPlayIE +from ..compat import compat_urlparse +from ..utils import ExtractorError, extract_attributes class Tele5IE(DPlayIE): diff --git a/youtube_dl/extractor/telecinco.py b/youtube_dl/extractor/telecinco.py index eecd6a5c9..0634d0ccf 100644 --- a/youtube_dl/extractor/telecinco.py +++ b/youtube_dl/extractor/telecinco.py @@ -5,12 +5,7 @@ import json import re from .common import InfoExtractor -from ..utils import ( - clean_html, - int_or_none, - str_or_none, - try_get, -) +from ..utils import clean_html, int_or_none, str_or_none, try_get class TelecincoIE(InfoExtractor): diff --git a/youtube_dl/extractor/telegraaf.py b/youtube_dl/extractor/telegraaf.py index 5174898f2..e2783109a 100644 --- a/youtube_dl/extractor/telegraaf.py +++ b/youtube_dl/extractor/telegraaf.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - parse_iso8601, - try_get, -) +from ..utils import determine_ext, int_or_none, parse_iso8601, try_get class TelegraafIE(InfoExtractor): diff --git a/youtube_dl/extractor/telequebec.py b/youtube_dl/extractor/telequebec.py index 800d87b70..8f855f6df 100644 --- a/youtube_dl/extractor/telequebec.py +++ b/youtube_dl/extractor/telequebec.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - smuggle_url, - try_get, - unified_timestamp, -) +from ..utils import int_or_none, smuggle_url, try_get, unified_timestamp class TeleQuebecBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/tennistv.py b/youtube_dl/extractor/tennistv.py index a586f30ad..3513ecd89 100644 --- a/youtube_dl/extractor/tennistv.py +++ b/youtube_dl/extractor/tennistv.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import json from .common import InfoExtractor - -from ..utils import ( - ExtractorError, - unified_timestamp, -) +from ..utils import ExtractorError, unified_timestamp class TennisTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/tenplay.py b/youtube_dl/extractor/tenplay.py index cd30d57f4..9f9e9927b 100644 --- a/youtube_dl/extractor/tenplay.py +++ b/youtube_dl/extractor/tenplay.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - HEADRequest, - parse_age_limit, - parse_iso8601, - # smuggle_url, -) +from ..utils import HEADRequest, parse_age_limit, parse_iso8601 # smuggle_url, class TenPlayIE(InfoExtractor): diff --git a/youtube_dl/extractor/tf1.py b/youtube_dl/extractor/tf1.py index 23c2808a1..4f5eca413 100644 --- a/youtube_dl/extractor/tf1.py +++ b/youtube_dl/extractor/tf1.py @@ -5,11 +5,7 @@ import json import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, - try_get, -) +from ..utils import int_or_none, parse_iso8601, try_get class TF1IE(InfoExtractor): diff --git a/youtube_dl/extractor/tfo.py b/youtube_dl/extractor/tfo.py index 0631cb7ab..c125acb4b 100644 --- a/youtube_dl/extractor/tfo.py +++ b/youtube_dl/extractor/tfo.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import json from .common import InfoExtractor -from ..utils import ( - HEADRequest, - ExtractorError, - int_or_none, - clean_html, -) +from ..utils import ExtractorError, HEADRequest, clean_html, int_or_none class TFOIE(InfoExtractor): diff --git a/youtube_dl/extractor/theintercept.py b/youtube_dl/extractor/theintercept.py index f23b58713..069a35109 100644 --- a/youtube_dl/extractor/theintercept.py +++ b/youtube_dl/extractor/theintercept.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - parse_iso8601, - int_or_none, - ExtractorError, -) +from ..utils import ExtractorError, int_or_none, parse_iso8601 class TheInterceptIE(InfoExtractor): diff --git a/youtube_dl/extractor/theplatform.py b/youtube_dl/extractor/theplatform.py index adfe11e31..228369d8f 100644 --- a/youtube_dl/extractor/theplatform.py +++ b/youtube_dl/extractor/theplatform.py @@ -1,30 +1,26 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import time -import hmac import binascii import hashlib +import hmac +import re +import time - -from .once import OnceIE from .adobepass import AdobePassIE -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) +from .once import OnceIE +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, + find_xpath_attr, float_or_none, int_or_none, + mimetype2ext, sanitized_Request, unsmuggle_url, update_url_query, xpath_with_ns, - mimetype2ext, - find_xpath_attr, ) default_ns = 'http://www.w3.org/2005/SMIL21/Language' diff --git a/youtube_dl/extractor/thescene.py b/youtube_dl/extractor/thescene.py index cd642355c..9f4ea0010 100644 --- a/youtube_dl/extractor/thescene.py +++ b/youtube_dl/extractor/thescene.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals from .common import InfoExtractor - from ..compat import compat_urlparse diff --git a/youtube_dl/extractor/theweatherchannel.py b/youtube_dl/extractor/theweatherchannel.py index b2a8c3797..103a0a969 100644 --- a/youtube_dl/extractor/theweatherchannel.py +++ b/youtube_dl/extractor/theweatherchannel.py @@ -5,11 +5,7 @@ import json import re from .theplatform import ThePlatformIE -from ..utils import ( - determine_ext, - parse_duration, - parse_iso8601, -) +from ..utils import determine_ext, parse_duration, parse_iso8601 class TheWeatherChannelIE(ThePlatformIE): diff --git a/youtube_dl/extractor/threeqsdn.py b/youtube_dl/extractor/threeqsdn.py index f6d37bb9e..1770cdbf6 100644 --- a/youtube_dl/extractor/threeqsdn.py +++ b/youtube_dl/extractor/threeqsdn.py @@ -5,8 +5,8 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( - determine_ext, ExtractorError, + determine_ext, float_or_none, int_or_none, parse_iso8601, diff --git a/youtube_dl/extractor/tiktok.py b/youtube_dl/extractor/tiktok.py index 4faa6de54..96b2100db 100644 --- a/youtube_dl/extractor/tiktok.py +++ b/youtube_dl/extractor/tiktok.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( - compat_str, ExtractorError, + compat_str, float_or_none, int_or_none, str_or_none, diff --git a/youtube_dl/extractor/tmz.py b/youtube_dl/extractor/tmz.py index 3d1bf75ff..e87cd5bf1 100644 --- a/youtube_dl/extractor/tmz.py +++ b/youtube_dl/extractor/tmz.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from .jwplatform import JWPlatformIE from .kaltura import KalturaIE -from ..utils import ( - int_or_none, - unified_timestamp, -) +from ..utils import int_or_none, unified_timestamp class TMZIE(InfoExtractor): diff --git a/youtube_dl/extractor/toggle.py b/youtube_dl/extractor/toggle.py index 270c84daa..891f59fb6 100644 --- a/youtube_dl/extractor/toggle.py +++ b/youtube_dl/extractor/toggle.py @@ -6,8 +6,8 @@ import re from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, float_or_none, int_or_none, parse_iso8601, diff --git a/youtube_dl/extractor/toongoggles.py b/youtube_dl/extractor/toongoggles.py index b5ba1c01d..59c1a8627 100644 --- a/youtube_dl/extractor/toongoggles.py +++ b/youtube_dl/extractor/toongoggles.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, -) +from ..utils import int_or_none, parse_duration class ToonGogglesIE(InfoExtractor): diff --git a/youtube_dl/extractor/toutv.py b/youtube_dl/extractor/toutv.py index 44b022fca..74df2ed71 100644 --- a/youtube_dl/extractor/toutv.py +++ b/youtube_dl/extractor/toutv.py @@ -5,11 +5,7 @@ import json from .radiocanada import RadioCanadaIE from ..compat import compat_HTTPError -from ..utils import ( - ExtractorError, - int_or_none, - merge_dicts, -) +from ..utils import ExtractorError, int_or_none, merge_dicts class TouTvIE(RadioCanadaIE): diff --git a/youtube_dl/extractor/toypics.py b/youtube_dl/extractor/toypics.py index f705a06c9..41215c44e 100644 --- a/youtube_dl/extractor/toypics.py +++ b/youtube_dl/extractor/toypics.py @@ -1,9 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor import re +from .common import InfoExtractor + class ToypicsIE(InfoExtractor): IE_DESC = 'Toypics video' diff --git a/youtube_dl/extractor/trilulilu.py b/youtube_dl/extractor/trilulilu.py index a800449e9..501e864e2 100644 --- a/youtube_dl/extractor/trilulilu.py +++ b/youtube_dl/extractor/trilulilu.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) +from ..utils import ExtractorError, int_or_none, parse_iso8601 class TriluliluIE(InfoExtractor): diff --git a/youtube_dl/extractor/trovo.py b/youtube_dl/extractor/trovo.py index de0107aa9..c80d5b5bc 100644 --- a/youtube_dl/extractor/trovo.py +++ b/youtube_dl/extractor/trovo.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import json from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - str_or_none, - try_get, -) +from ..utils import ExtractorError, int_or_none, str_or_none, try_get class TrovoBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/trutv.py b/youtube_dl/extractor/trutv.py index ce892c8c5..c6f627b79 100644 --- a/youtube_dl/extractor/trutv.py +++ b/youtube_dl/extractor/trutv.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .turner import TurnerBaseIE -from ..utils import ( - int_or_none, - parse_iso8601, -) +from ..utils import int_or_none, parse_iso8601 class TruTVIE(TurnerBaseIE): diff --git a/youtube_dl/extractor/tube8.py b/youtube_dl/extractor/tube8.py index db93b0182..ba74c9239 100644 --- a/youtube_dl/extractor/tube8.py +++ b/youtube_dl/extractor/tube8.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re -from ..utils import ( - int_or_none, - str_to_int, -) from .keezmovies import KeezMoviesIE +from ..utils import int_or_none, str_to_int class Tube8IE(KeezMoviesIE): diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index ae584ad69..c9cda3c3e 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - urlencode_postdata -) +from ..utils import ExtractorError, int_or_none, urlencode_postdata class TumblrIE(InfoExtractor): diff --git a/youtube_dl/extractor/tunein.py b/youtube_dl/extractor/tunein.py index c7a5f5a63..a53d2977a 100644 --- a/youtube_dl/extractor/tunein.py +++ b/youtube_dl/extractor/tunein.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ExtractorError from ..compat import compat_urlparse +from ..utils import ExtractorError class TuneInBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/tunepk.py b/youtube_dl/extractor/tunepk.py index 9d42651ce..3c28fbf15 100644 --- a/youtube_dl/extractor/tunepk.py +++ b/youtube_dl/extractor/tunepk.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - try_get, - unified_timestamp, -) +from ..utils import int_or_none, try_get, unified_timestamp class TunePkIE(InfoExtractor): diff --git a/youtube_dl/extractor/turbo.py b/youtube_dl/extractor/turbo.py index be3eaa5c2..67f756b75 100644 --- a/youtube_dl/extractor/turbo.py +++ b/youtube_dl/extractor/turbo.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - qualities, - xpath_text, -) +from ..utils import ExtractorError, int_or_none, qualities, xpath_text class TurboIE(InfoExtractor): diff --git a/youtube_dl/extractor/turner.py b/youtube_dl/extractor/turner.py index 81229a54b..e790f48ba 100644 --- a/youtube_dl/extractor/turner.py +++ b/youtube_dl/extractor/turner.py @@ -6,17 +6,17 @@ import re from .adobepass import AdobePassIE from ..compat import compat_str from ..utils import ( - fix_xml_ampersands, - xpath_text, - int_or_none, - determine_ext, - float_or_none, - parse_duration, - xpath_attr, - update_url_query, ExtractorError, + determine_ext, + fix_xml_ampersands, + float_or_none, + int_or_none, + parse_duration, strip_or_none, + update_url_query, url_or_none, + xpath_attr, + xpath_text, ) diff --git a/youtube_dl/extractor/tv2.py b/youtube_dl/extractor/tv2.py index 334b7d540..6c12a8378 100644 --- a/youtube_dl/extractor/tv2.py +++ b/youtube_dl/extractor/tv2.py @@ -6,10 +6,10 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( - determine_ext, ExtractorError, - int_or_none, + determine_ext, float_or_none, + int_or_none, js_to_json, parse_iso8601, remove_end, diff --git a/youtube_dl/extractor/tv2dk.py b/youtube_dl/extractor/tv2dk.py index ec5cbdf03..c3024ccf6 100644 --- a/youtube_dl/extractor/tv2dk.py +++ b/youtube_dl/extractor/tv2dk.py @@ -5,12 +5,7 @@ import json import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - extract_attributes, - js_to_json, - url_or_none, -) +from ..utils import determine_ext, extract_attributes, js_to_json, url_or_none class TV2DKIE(InfoExtractor): diff --git a/youtube_dl/extractor/tv4.py b/youtube_dl/extractor/tv4.py index b73bab9a8..be3ddcd8d 100644 --- a/youtube_dl/extractor/tv4.py +++ b/youtube_dl/extractor/tv4.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) +from ..utils import int_or_none, parse_iso8601 class TV4IE(InfoExtractor): diff --git a/youtube_dl/extractor/tv5unis.py b/youtube_dl/extractor/tv5unis.py index eabdc2271..b15806998 100644 --- a/youtube_dl/extractor/tv5unis.py +++ b/youtube_dl/extractor/tv5unis.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_age_limit, - smuggle_url, - try_get, -) +from ..utils import int_or_none, parse_age_limit, smuggle_url, try_get class TV5UnisBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/tva.py b/youtube_dl/extractor/tva.py index 52a4ddf32..5650f76a6 100644 --- a/youtube_dl/extractor/tva.py +++ b/youtube_dl/extractor/tva.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, - smuggle_url, - strip_or_none, -) +from ..utils import float_or_none, int_or_none, smuggle_url, strip_or_none class TVAIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvanouvelles.py b/youtube_dl/extractor/tvanouvelles.py index 1086176a2..c649f6413 100644 --- a/youtube_dl/extractor/tvanouvelles.py +++ b/youtube_dl/extractor/tvanouvelles.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from .brightcove import BrightcoveNewIE +from .common import InfoExtractor class TVANouvellesIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvc.py b/youtube_dl/extractor/tvc.py index 008f64cc2..c52c4f9c9 100644 --- a/youtube_dl/extractor/tvc.py +++ b/youtube_dl/extractor/tvc.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - clean_html, - int_or_none, -) +from ..utils import clean_html, int_or_none class TVCIE(InfoExtractor): diff --git a/youtube_dl/extractor/tver.py b/youtube_dl/extractor/tver.py index a4a30b1e6..515baf60d 100644 --- a/youtube_dl/extractor/tver.py +++ b/youtube_dl/extractor/tver.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - remove_start, - smuggle_url, - try_get, -) +from ..utils import int_or_none, remove_start, smuggle_url, try_get class TVerIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvn24.py b/youtube_dl/extractor/tvn24.py index de0fb5063..1f891d78a 100644 --- a/youtube_dl/extractor/tvn24.py +++ b/youtube_dl/extractor/tvn24.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - NO_DEFAULT, - unescapeHTML, -) +from ..utils import NO_DEFAULT, int_or_none, unescapeHTML class TVN24IE(InfoExtractor): diff --git a/youtube_dl/extractor/tvnet.py b/youtube_dl/extractor/tvnet.py index 4222ff9ee..98ccfcf11 100644 --- a/youtube_dl/extractor/tvnet.py +++ b/youtube_dl/extractor/tvnet.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - unescapeHTML, - url_or_none, -) +from ..utils import int_or_none, unescapeHTML, url_or_none class TVNetIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvnoe.py b/youtube_dl/extractor/tvnoe.py index 26a5aeae4..4d6398941 100644 --- a/youtube_dl/extractor/tvnoe.py +++ b/youtube_dl/extractor/tvnoe.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - clean_html, - get_element_by_class, - js_to_json, -) +from ..utils import clean_html, get_element_by_class, js_to_json class TVNoeIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvnow.py b/youtube_dl/extractor/tvnow.py index 9c8a8a0dc..289f96e56 100644 --- a/youtube_dl/extractor/tvnow.py +++ b/youtube_dl/extractor/tvnow.py @@ -8,8 +8,8 @@ from ..compat import compat_str from ..utils import ( ExtractorError, int_or_none, - parse_iso8601, parse_duration, + parse_iso8601, str_or_none, update_url_query, urljoin, diff --git a/youtube_dl/extractor/tvp.py b/youtube_dl/extractor/tvp.py index accff75b5..fa88c724d 100644 --- a/youtube_dl/extractor/tvp.py +++ b/youtube_dl/extractor/tvp.py @@ -6,9 +6,9 @@ import re from .common import InfoExtractor from ..utils import ( + ExtractorError, clean_html, determine_ext, - ExtractorError, get_element_by_attribute, orderedSet, ) diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dl/extractor/tvplay.py index 0d858c025..cce5d3b47 100644 --- a/youtube_dl/extractor/tvplay.py +++ b/youtube_dl/extractor/tvplay.py @@ -4,13 +4,10 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_urlparse, -) +from ..compat import compat_HTTPError, compat_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, parse_duration, parse_iso8601, diff --git a/youtube_dl/extractor/tvplayer.py b/youtube_dl/extractor/tvplayer.py index 8f8686a65..c4934b083 100644 --- a/youtube_dl/extractor/tvplayer.py +++ b/youtube_dl/extractor/tvplayer.py @@ -2,15 +2,12 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( + ExtractorError, extract_attributes, try_get, urlencode_postdata, - ExtractorError, ) diff --git a/youtube_dl/extractor/tweakers.py b/youtube_dl/extractor/tweakers.py index 2b10d9bca..81aefb1f2 100644 --- a/youtube_dl/extractor/tweakers.py +++ b/youtube_dl/extractor/tweakers.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - determine_ext, - mimetype2ext, -) +from ..utils import determine_ext, int_or_none, mimetype2ext class TweakersIE(InfoExtractor): diff --git a/youtube_dl/extractor/twentyfourvideo.py b/youtube_dl/extractor/twentyfourvideo.py index 74d14049b..e1fb517a5 100644 --- a/youtube_dl/extractor/twentyfourvideo.py +++ b/youtube_dl/extractor/twentyfourvideo.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - parse_iso8601, - int_or_none, - xpath_attr, - xpath_element, -) +from ..utils import int_or_none, parse_iso8601, xpath_attr, xpath_element class TwentyFourVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/twentymin.py b/youtube_dl/extractor/twentymin.py index a42977f39..ecdfb9fcd 100644 --- a/youtube_dl/extractor/twentymin.py +++ b/youtube_dl/extractor/twentymin.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - try_get, -) +from ..utils import int_or_none, try_get class TwentyMinutenIE(InfoExtractor): diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py index a378bd6dc..fd0e73030 100644 --- a/youtube_dl/extractor/twitch.py +++ b/youtube_dl/extractor/twitch.py @@ -11,14 +11,14 @@ from .common import InfoExtractor from ..compat import ( compat_parse_qs, compat_str, - compat_urlparse, compat_urllib_parse_urlencode, compat_urllib_parse_urlparse, + compat_urlparse, ) from ..utils import ( + ExtractorError, clean_html, dict_get, - ExtractorError, float_or_none, int_or_none, parse_duration, diff --git a/youtube_dl/extractor/twitter.py b/youtube_dl/extractor/twitter.py index cfa7a7326..5e58a8c8b 100644 --- a/youtube_dl/extractor/twitter.py +++ b/youtube_dl/extractor/twitter.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor +from .periscope import PeriscopeBaseIE, PeriscopeIE from ..compat import ( compat_HTTPError, compat_parse_qs, @@ -11,23 +12,18 @@ from ..compat import ( compat_urllib_parse_urlparse, ) from ..utils import ( - dict_get, ExtractorError, + dict_get, float_or_none, int_or_none, - try_get, strip_or_none, + try_get, unified_timestamp, update_url_query, url_or_none, xpath_text, ) -from .periscope import ( - PeriscopeBaseIE, - PeriscopeIE, -) - class TwitterBaseIE(InfoExtractor): _API_BASE = 'https://api.twitter.com/1.1/' diff --git a/youtube_dl/extractor/udemy.py b/youtube_dl/extractor/udemy.py index 2a4faecef..b4f6a034b 100644 --- a/youtube_dl/extractor/udemy.py +++ b/youtube_dl/extractor/udemy.py @@ -11,9 +11,9 @@ from ..compat import ( compat_urlparse, ) from ..utils import ( + ExtractorError, determine_ext, extract_attributes, - ExtractorError, float_or_none, int_or_none, js_to_json, diff --git a/youtube_dl/extractor/udn.py b/youtube_dl/extractor/udn.py index 2c8e5c7b4..f4bb6963a 100644 --- a/youtube_dl/extractor/udn.py +++ b/youtube_dl/extractor/udn.py @@ -4,12 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - js_to_json, -) from ..compat import compat_urlparse +from ..utils import determine_ext, int_or_none, js_to_json class UDNEmbedIE(InfoExtractor): diff --git a/youtube_dl/extractor/umg.py b/youtube_dl/extractor/umg.py index 47948b6ce..df1cf5e8b 100644 --- a/youtube_dl/extractor/umg.py +++ b/youtube_dl/extractor/umg.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_filesize, - parse_iso8601, -) +from ..utils import int_or_none, parse_filesize, parse_iso8601 class UMGDeIE(InfoExtractor): diff --git a/youtube_dl/extractor/uol.py b/youtube_dl/extractor/uol.py index 59f8e5dc3..5e8aefb60 100644 --- a/youtube_dl/extractor/uol.py +++ b/youtube_dl/extractor/uol.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_urlencode, -) +from ..compat import compat_str, compat_urllib_parse_urlencode from ..utils import ( clean_html, int_or_none, diff --git a/youtube_dl/extractor/uplynk.py b/youtube_dl/extractor/uplynk.py index f06bf5b12..0b5e7502a 100644 --- a/youtube_dl/extractor/uplynk.py +++ b/youtube_dl/extractor/uplynk.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - float_or_none, - ExtractorError, -) +from ..utils import ExtractorError, float_or_none class UplynkIE(InfoExtractor): diff --git a/youtube_dl/extractor/urort.py b/youtube_dl/extractor/urort.py index 8f6edab4b..ad7c457cd 100644 --- a/youtube_dl/extractor/urort.py +++ b/youtube_dl/extractor/urort.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse, -) -from ..utils import ( - unified_strdate, -) +from ..compat import compat_urllib_parse +from ..utils import unified_strdate class UrortIE(InfoExtractor): diff --git a/youtube_dl/extractor/urplay.py b/youtube_dl/extractor/urplay.py index abd2bee84..1b57708d7 100644 --- a/youtube_dl/extractor/urplay.py +++ b/youtube_dl/extractor/urplay.py @@ -3,10 +3,10 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( - dict_get, ExtractorError, - int_or_none, ISO639Utils, + dict_get, + int_or_none, parse_age_limit, try_get, unified_timestamp, diff --git a/youtube_dl/extractor/usatoday.py b/youtube_dl/extractor/usatoday.py index b2103448d..927f13609 100644 --- a/youtube_dl/extractor/usatoday.py +++ b/youtube_dl/extractor/usatoday.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor +from ..compat import compat_str from ..utils import ( ExtractorError, get_element_by_attribute, @@ -9,7 +10,6 @@ from ..utils import ( try_get, update_url_query, ) -from ..compat import compat_str class USATodayIE(InfoExtractor): diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py index 1e29cbe22..620505e28 100644 --- a/youtube_dl/extractor/ustream.py +++ b/youtube_dl/extractor/ustream.py @@ -4,15 +4,12 @@ import random import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - encode_data_uri, ExtractorError, - int_or_none, + encode_data_uri, float_or_none, + int_or_none, mimetype2ext, str_or_none, ) diff --git a/youtube_dl/extractor/ustudio.py b/youtube_dl/extractor/ustudio.py index 56509beed..7cdcaad05 100644 --- a/youtube_dl/extractor/ustudio.py +++ b/youtube_dl/extractor/ustudio.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, - unescapeHTML, -) +from ..utils import int_or_none, unescapeHTML, unified_strdate class UstudioIE(InfoExtractor): diff --git a/youtube_dl/extractor/varzesh3.py b/youtube_dl/extractor/varzesh3.py index f474ed73f..2fd6f4718 100644 --- a/youtube_dl/extractor/varzesh3.py +++ b/youtube_dl/extractor/varzesh3.py @@ -2,14 +2,8 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, - compat_parse_qs, -) -from ..utils import ( - clean_html, - remove_start, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse +from ..utils import clean_html, remove_start class Varzesh3IE(InfoExtractor): diff --git a/youtube_dl/extractor/veehd.py b/youtube_dl/extractor/veehd.py index a6dc3c8d8..43799ff79 100644 --- a/youtube_dl/extractor/veehd.py +++ b/youtube_dl/extractor/veehd.py @@ -1,18 +1,11 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote, - compat_urlparse, -) -from ..utils import ( - ExtractorError, - clean_html, - get_element_by_id, -) +from ..compat import compat_urllib_parse_unquote, compat_urlparse +from ..utils import ExtractorError, clean_html, get_element_by_id class VeeHDIE(InfoExtractor): diff --git a/youtube_dl/extractor/veoh.py b/youtube_dl/extractor/veoh.py index 1c44c145c..f4bca46d1 100644 --- a/youtube_dl/extractor/veoh.py +++ b/youtube_dl/extractor/veoh.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - qualities, -) +from ..utils import int_or_none, parse_duration, qualities class VeohIE(InfoExtractor): diff --git a/youtube_dl/extractor/vesti.py b/youtube_dl/extractor/vesti.py index 5ab716880..582243a66 100644 --- a/youtube_dl/extractor/vesti.py +++ b/youtube_dl/extractor/vesti.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ExtractorError from .rutv import RUTVIE +from ..utils import ExtractorError class VestiIE(InfoExtractor): diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py index 4ea9f1b4b..443df7135 100644 --- a/youtube_dl/extractor/vevo.py +++ b/youtube_dl/extractor/vevo.py @@ -1,19 +1,11 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, - compat_HTTPError, -) -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) +from ..compat import compat_HTTPError, compat_str, compat_urlparse +from ..utils import ExtractorError, int_or_none, parse_iso8601 class VevoBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vgtv.py b/youtube_dl/extractor/vgtv.py index 22e99e8f0..bb4207e49 100644 --- a/youtube_dl/extractor/vgtv.py +++ b/youtube_dl/extractor/vgtv.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from .xstream import XstreamIE -from ..utils import ( - ExtractorError, - float_or_none, - try_get, -) +from ..utils import ExtractorError, float_or_none, try_get class VGTVIE(XstreamIE): diff --git a/youtube_dl/extractor/vice.py b/youtube_dl/extractor/vice.py index e37499512..7e1e5a880 100644 --- a/youtube_dl/extractor/vice.py +++ b/youtube_dl/extractor/vice.py @@ -11,15 +11,12 @@ import time from .adobepass import AdobePassIE from .common import InfoExtractor from .youtube import YoutubeIE -from ..compat import ( - compat_HTTPError, - compat_str, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( - clean_html, ExtractorError, - int_or_none, OnDemandPagedList, + clean_html, + int_or_none, parse_age_limit, str_or_none, try_get, diff --git a/youtube_dl/extractor/vidbit.py b/youtube_dl/extractor/vidbit.py index 91f45b7cc..b9d45f616 100644 --- a/youtube_dl/extractor/vidbit.py +++ b/youtube_dl/extractor/vidbit.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - js_to_json, - remove_end, - unified_strdate, -) +from ..utils import int_or_none, js_to_json, remove_end, unified_strdate class VidbitIE(InfoExtractor): diff --git a/youtube_dl/extractor/viddler.py b/youtube_dl/extractor/viddler.py index 642358433..675189b95 100644 --- a/youtube_dl/extractor/viddler.py +++ b/youtube_dl/extractor/viddler.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, -) +from ..utils import float_or_none, int_or_none class ViddlerIE(InfoExtractor): diff --git a/youtube_dl/extractor/videa.py b/youtube_dl/extractor/videa.py index 4589e78a1..a4cd44be4 100644 --- a/youtube_dl/extractor/videa.py +++ b/youtube_dl/extractor/videa.py @@ -6,6 +6,12 @@ import re import string from .common import InfoExtractor +from ..compat import ( + compat_b64decode, + compat_ord, + compat_struct_pack, + compat_urlparse, +) from ..utils import ( ExtractorError, int_or_none, @@ -16,12 +22,6 @@ from ..utils import ( xpath_element, xpath_text, ) -from ..compat import ( - compat_b64decode, - compat_ord, - compat_struct_pack, - compat_urlparse, -) class VideaIE(InfoExtractor): diff --git a/youtube_dl/extractor/videofyme.py b/youtube_dl/extractor/videofyme.py index cd3f50a63..a9cc88cfa 100644 --- a/youtube_dl/extractor/videofyme.py +++ b/youtube_dl/extractor/videofyme.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) +from ..utils import int_or_none, parse_iso8601 class VideofyMeIE(InfoExtractor): diff --git a/youtube_dl/extractor/videomore.py b/youtube_dl/extractor/videomore.py index e0c10aa5b..1356d81b2 100644 --- a/youtube_dl/extractor/videomore.py +++ b/youtube_dl/extractor/videomore.py @@ -4,15 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_str, - compat_urllib_parse_urlparse, -) -from ..utils import ( - ExtractorError, - int_or_none, -) +from ..compat import compat_parse_qs, compat_str, compat_urllib_parse_urlparse +from ..utils import ExtractorError, int_or_none class VideomoreBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py index 174e69cd6..9d404db63 100644 --- a/youtube_dl/extractor/vidme.py +++ b/youtube_dl/extractor/vidme.py @@ -6,8 +6,8 @@ from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( ExtractorError, - int_or_none, float_or_none, + int_or_none, parse_iso8601, url_or_none, ) diff --git a/youtube_dl/extractor/vier.py b/youtube_dl/extractor/vier.py index dbd5ba9ba..45c185fd0 100644 --- a/youtube_dl/extractor/vier.py +++ b/youtube_dl/extractor/vier.py @@ -1,15 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -import re import itertools +import re from .common import InfoExtractor -from ..utils import ( - urlencode_postdata, - int_or_none, - unified_strdate, -) +from ..utils import int_or_none, unified_strdate, urlencode_postdata class VierIE(InfoExtractor): diff --git a/youtube_dl/extractor/viewlift.py b/youtube_dl/extractor/viewlift.py index d6b92b1c8..d23473dac 100644 --- a/youtube_dl/extractor/viewlift.py +++ b/youtube_dl/extractor/viewlift.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - ExtractorError, - int_or_none, - parse_age_limit, -) +from ..utils import ExtractorError, int_or_none, parse_age_limit class ViewLiftBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/viidea.py b/youtube_dl/extractor/viidea.py index a0abbae60..d12131e8b 100644 --- a/youtube_dl/extractor/viidea.py +++ b/youtube_dl/extractor/viidea.py @@ -3,17 +3,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, - compat_urlparse, -) -from ..utils import ( - ExtractorError, - js_to_json, - parse_duration, - parse_iso8601, -) +from ..compat import compat_HTTPError, compat_str, compat_urlparse +from ..utils import ExtractorError, js_to_json, parse_duration, parse_iso8601 class ViideaIE(InfoExtractor): diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index 853b38402..04ae91680 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -3,25 +3,25 @@ from __future__ import unicode_literals import base64 import functools -import re import itertools +import re from .common import InfoExtractor from ..compat import ( - compat_kwargs, compat_HTTPError, + compat_kwargs, compat_str, compat_urlparse, ) from ..utils import ( + ExtractorError, + OnDemandPagedList, clean_html, determine_ext, - ExtractorError, get_element_by_class, - js_to_json, int_or_none, + js_to_json, merge_dicts, - OnDemandPagedList, parse_filesize, parse_iso8601, sanitized_Request, @@ -29,11 +29,11 @@ from ..utils import ( std_headers, str_or_none, try_get, + unescapeHTML, unified_timestamp, unsmuggle_url, urlencode_postdata, urljoin, - unescapeHTML, ) diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py index 80b896b56..b212d05a3 100644 --- a/youtube_dl/extractor/vine.py +++ b/youtube_dl/extractor/vine.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - determine_ext, - int_or_none, - unified_timestamp, -) +from ..utils import determine_ext, int_or_none, unified_timestamp class VineIE(InfoExtractor): diff --git a/youtube_dl/extractor/viqeo.py b/youtube_dl/extractor/viqeo.py index be7dfa814..ea17597d1 100644 --- a/youtube_dl/extractor/viqeo.py +++ b/youtube_dl/extractor/viqeo.py @@ -4,11 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - str_or_none, - url_or_none, -) +from ..utils import int_or_none, str_or_none, url_or_none class ViqeoIE(InfoExtractor): diff --git a/youtube_dl/extractor/viu.py b/youtube_dl/extractor/viu.py index 3bd37525b..d2d969355 100644 --- a/youtube_dl/extractor/viu.py +++ b/youtube_dl/extractor/viu.py @@ -4,14 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_kwargs, - compat_str, -) -from ..utils import ( - ExtractorError, - int_or_none, -) +from ..compat import compat_kwargs, compat_str +from ..utils import ExtractorError, int_or_none class ViuBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index 6b3513ee0..96abfca51 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -6,13 +6,18 @@ import functools import re from .common import InfoExtractor +from .dailymotion import DailymotionIE +from .odnoklassniki import OdnoklassnikiIE +from .pladform import PladformIE +from .vimeo import VimeoIE +from .youtube import YoutubeIE from ..compat import compat_urlparse from ..utils import ( - clean_html, ExtractorError, + OnDemandPagedList, + clean_html, get_element_by_class, int_or_none, - OnDemandPagedList, orderedSet, str_or_none, str_to_int, @@ -21,11 +26,6 @@ from ..utils import ( url_or_none, urlencode_postdata, ) -from .dailymotion import DailymotionIE -from .odnoklassniki import OdnoklassnikiIE -from .pladform import PladformIE -from .vimeo import VimeoIE -from .youtube import YoutubeIE class VKBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vlive.py b/youtube_dl/extractor/vlive.py index 42da34d44..8ed9d1754 100644 --- a/youtube_dl/extractor/vlive.py +++ b/youtube_dl/extractor/vlive.py @@ -5,10 +5,7 @@ import itertools import json from .naver import NaverBaseIE -from ..compat import ( - compat_HTTPError, - compat_str, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( ExtractorError, int_or_none, diff --git a/youtube_dl/extractor/vodlocker.py b/youtube_dl/extractor/vodlocker.py index 02c9617d2..79b0359a6 100644 --- a/youtube_dl/extractor/vodlocker.py +++ b/youtube_dl/extractor/vodlocker.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( - ExtractorError, NO_DEFAULT, + ExtractorError, sanitized_Request, urlencode_postdata, ) diff --git a/youtube_dl/extractor/voicerepublic.py b/youtube_dl/extractor/voicerepublic.py index a52e40afa..9be599bbe 100644 --- a/youtube_dl/extractor/voicerepublic.py +++ b/youtube_dl/extractor/voicerepublic.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - determine_ext, - int_or_none, - urljoin, -) +from ..utils import ExtractorError, determine_ext, int_or_none, urljoin class VoiceRepublicIE(InfoExtractor): diff --git a/youtube_dl/extractor/voot.py b/youtube_dl/extractor/voot.py index 751b21ee5..beaa83ba5 100644 --- a/youtube_dl/extractor/voot.py +++ b/youtube_dl/extractor/voot.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - try_get, - unified_timestamp, -) +from ..utils import ExtractorError, int_or_none, try_get, unified_timestamp class VootIE(InfoExtractor): diff --git a/youtube_dl/extractor/voxmedia.py b/youtube_dl/extractor/voxmedia.py index 661208125..b0f354328 100644 --- a/youtube_dl/extractor/voxmedia.py +++ b/youtube_dl/extractor/voxmedia.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from .once import OnceIE from ..compat import compat_urllib_parse_unquote -from ..utils import ( - ExtractorError, - int_or_none, - try_get, - unified_timestamp, -) +from ..utils import ExtractorError, int_or_none, try_get, unified_timestamp class VoxMediaVolumeIE(OnceIE): diff --git a/youtube_dl/extractor/vrak.py b/youtube_dl/extractor/vrak.py index daa247cce..80e0544e9 100644 --- a/youtube_dl/extractor/vrak.py +++ b/youtube_dl/extractor/vrak.py @@ -3,14 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from .brightcove import BrightcoveNewIE -from ..utils import ( - int_or_none, - parse_age_limit, - smuggle_url, - unescapeHTML, -) +from .common import InfoExtractor +from ..utils import int_or_none, parse_age_limit, smuggle_url, unescapeHTML class VrakIE(InfoExtractor): diff --git a/youtube_dl/extractor/vrv.py b/youtube_dl/extractor/vrv.py index 6e51469b0..d612912dc 100644 --- a/youtube_dl/extractor/vrv.py +++ b/youtube_dl/extractor/vrv.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals import base64 -import json import hashlib import hmac +import json import random import string import time @@ -12,14 +12,10 @@ import time from .common import InfoExtractor from ..compat import ( compat_HTTPError, - compat_urllib_parse_urlencode, compat_urllib_parse, + compat_urllib_parse_urlencode, ) -from ..utils import ( - ExtractorError, - float_or_none, - int_or_none, -) +from ..utils import ExtractorError, float_or_none, int_or_none class VRVBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vshare.py b/youtube_dl/extractor/vshare.py index c631ac1fa..bf6d9fff9 100644 --- a/youtube_dl/extractor/vshare.py +++ b/youtube_dl/extractor/vshare.py @@ -5,10 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_chr -from ..utils import ( - decode_packed_codes, - ExtractorError, -) +from ..utils import ExtractorError, decode_packed_codes class VShareIE(InfoExtractor): diff --git a/youtube_dl/extractor/vtm.py b/youtube_dl/extractor/vtm.py index 093f1aa69..6766b8f56 100644 --- a/youtube_dl/extractor/vtm.py +++ b/youtube_dl/extractor/vtm.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, - try_get, -) +from ..utils import int_or_none, parse_iso8601, try_get class VTMIE(InfoExtractor): diff --git a/youtube_dl/extractor/vube.py b/youtube_dl/extractor/vube.py index 8ce3a6b81..f88908de7 100644 --- a/youtube_dl/extractor/vube.py +++ b/youtube_dl/extractor/vube.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, -) -from ..utils import ( - int_or_none, - ExtractorError, -) +from ..compat import compat_str +from ..utils import ExtractorError, int_or_none class VubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/vuclip.py b/youtube_dl/extractor/vuclip.py index 55e087bdb..4871b3fbc 100644 --- a/youtube_dl/extractor/vuclip.py +++ b/youtube_dl/extractor/vuclip.py @@ -3,14 +3,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, -) -from ..utils import ( - ExtractorError, - parse_duration, - remove_end, -) +from ..compat import compat_urllib_parse_urlparse +from ..utils import ExtractorError, parse_duration, remove_end class VuClipIE(InfoExtractor): diff --git a/youtube_dl/extractor/vvvvid.py b/youtube_dl/extractor/vvvvid.py index 6a0d4e8f0..5c3329986 100644 --- a/youtube_dl/extractor/vvvvid.py +++ b/youtube_dl/extractor/vvvvid.py @@ -5,11 +5,7 @@ import re from .common import InfoExtractor from .youtube import YoutubeIE -from ..utils import ( - ExtractorError, - int_or_none, - str_or_none, -) +from ..utils import ExtractorError, int_or_none, str_or_none class VVVVIDIE(InfoExtractor): diff --git a/youtube_dl/extractor/vzaar.py b/youtube_dl/extractor/vzaar.py index b7d02fca3..b45ae37c5 100644 --- a/youtube_dl/extractor/vzaar.py +++ b/youtube_dl/extractor/vzaar.py @@ -5,12 +5,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - float_or_none, - unified_timestamp, - url_or_none, -) +from ..utils import float_or_none, int_or_none, unified_timestamp, url_or_none class VzaarIE(InfoExtractor): diff --git a/youtube_dl/extractor/wakanim.py b/youtube_dl/extractor/wakanim.py index f9a2395d9..46cbae62e 100644 --- a/youtube_dl/extractor/wakanim.py +++ b/youtube_dl/extractor/wakanim.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - merge_dicts, - urljoin, -) +from ..utils import ExtractorError, merge_dicts, urljoin class WakanimIE(InfoExtractor): diff --git a/youtube_dl/extractor/walla.py b/youtube_dl/extractor/walla.py index cbb548672..41c4b56ac 100644 --- a/youtube_dl/extractor/walla.py +++ b/youtube_dl/extractor/walla.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - xpath_text, - int_or_none, -) +from ..utils import int_or_none, xpath_text class WallaIE(InfoExtractor): diff --git a/youtube_dl/extractor/wat.py b/youtube_dl/extractor/wat.py index b15e03768..4942382d7 100644 --- a/youtube_dl/extractor/wat.py +++ b/youtube_dl/extractor/wat.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - try_get, - unified_strdate, -) +from ..utils import ExtractorError, int_or_none, try_get, unified_strdate class WatIE(InfoExtractor): diff --git a/youtube_dl/extractor/wdr.py b/youtube_dl/extractor/wdr.py index 10db73148..56f9a5e74 100644 --- a/youtube_dl/extractor/wdr.py +++ b/youtube_dl/extractor/wdr.py @@ -4,21 +4,18 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( + ExtractorError, determine_ext, dict_get, - ExtractorError, js_to_json, strip_jsonp, try_get, unified_strdate, update_url_query, - urlhandle_detect_ext, url_or_none, + urlhandle_detect_ext, ) diff --git a/youtube_dl/extractor/webcaster.py b/youtube_dl/extractor/webcaster.py index e4b65f54f..d6e9e74c4 100644 --- a/youtube_dl/extractor/webcaster.py +++ b/youtube_dl/extractor/webcaster.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - xpath_text, -) +from ..utils import determine_ext, xpath_text class WebcasterIE(InfoExtractor): diff --git a/youtube_dl/extractor/webofstories.py b/youtube_dl/extractor/webofstories.py index f2b8d19b4..4429a39d2 100644 --- a/youtube_dl/extractor/webofstories.py +++ b/youtube_dl/extractor/webofstories.py @@ -4,10 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - int_or_none, - orderedSet, -) +from ..utils import int_or_none, orderedSet class WebOfStoriesIE(InfoExtractor): diff --git a/youtube_dl/extractor/weibo.py b/youtube_dl/extractor/weibo.py index 621df5b54..d19268b64 100644 --- a/youtube_dl/extractor/weibo.py +++ b/youtube_dl/extractor/weibo.py @@ -1,21 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor - import json import random import re -from ..compat import ( - compat_parse_qs, - compat_str, -) -from ..utils import ( - js_to_json, - strip_jsonp, - urlencode_postdata, -) +from .common import InfoExtractor +from ..compat import compat_parse_qs, compat_str +from ..utils import js_to_json, strip_jsonp, urlencode_postdata class WeiboIE(InfoExtractor): diff --git a/youtube_dl/extractor/wsj.py b/youtube_dl/extractor/wsj.py index 67236f377..c4e810ed5 100644 --- a/youtube_dl/extractor/wsj.py +++ b/youtube_dl/extractor/wsj.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, - unified_strdate, -) +from ..utils import float_or_none, int_or_none, unified_strdate class WSJIE(InfoExtractor): diff --git a/youtube_dl/extractor/wwe.py b/youtube_dl/extractor/wwe.py index bebc77bb5..6573557ad 100644 --- a/youtube_dl/extractor/wwe.py +++ b/youtube_dl/extractor/wwe.py @@ -4,12 +4,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - try_get, - unescapeHTML, - url_or_none, - urljoin, -) +from ..utils import try_get, unescapeHTML, url_or_none, urljoin class WWEBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/xboxclips.py b/youtube_dl/extractor/xboxclips.py index 25f487e1e..8638355e2 100644 --- a/youtube_dl/extractor/xboxclips.py +++ b/youtube_dl/extractor/xboxclips.py @@ -4,15 +4,8 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) -from ..utils import ( - int_or_none, - month_by_abbreviation, - parse_filesize, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse +from ..utils import int_or_none, month_by_abbreviation, parse_filesize class XboxClipsIE(InfoExtractor): diff --git a/youtube_dl/extractor/xfileshare.py b/youtube_dl/extractor/xfileshare.py index df9efa9fa..9a4840996 100644 --- a/youtube_dl/extractor/xfileshare.py +++ b/youtube_dl/extractor/xfileshare.py @@ -6,9 +6,9 @@ import re from .common import InfoExtractor from ..compat import compat_chr from ..utils import ( + ExtractorError, decode_packed_codes, determine_ext, - ExtractorError, int_or_none, js_to_json, urlencode_postdata, diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index f764021ba..c1b5efafb 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -7,11 +7,11 @@ import re from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + ExtractorError, clean_html, determine_ext, dict_get, extract_attributes, - ExtractorError, float_or_none, int_or_none, parse_duration, diff --git a/youtube_dl/extractor/xminus.py b/youtube_dl/extractor/xminus.py index 36e5ead1e..f787d4287 100644 --- a/youtube_dl/extractor/xminus.py +++ b/youtube_dl/extractor/xminus.py @@ -5,13 +5,8 @@ import re import time from .common import InfoExtractor -from ..compat import ( - compat_ord, -) -from ..utils import ( - int_or_none, - parse_duration, -) +from ..compat import compat_ord +from ..utils import int_or_none, parse_duration class XMinusIE(InfoExtractor): diff --git a/youtube_dl/extractor/xnxx.py b/youtube_dl/extractor/xnxx.py index ac1ccc404..25c4460de 100644 --- a/youtube_dl/extractor/xnxx.py +++ b/youtube_dl/extractor/xnxx.py @@ -4,12 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - NO_DEFAULT, - str_to_int, -) +from ..utils import NO_DEFAULT, determine_ext, int_or_none, str_to_int class XNXXIE(InfoExtractor): diff --git a/youtube_dl/extractor/xstream.py b/youtube_dl/extractor/xstream.py index 76c91bd92..60d3062b0 100644 --- a/youtube_dl/extractor/xstream.py +++ b/youtube_dl/extractor/xstream.py @@ -5,11 +5,11 @@ import re from .common import InfoExtractor from ..utils import ( + find_xpath_attr, int_or_none, parse_iso8601, - xpath_with_ns, xpath_text, - find_xpath_attr, + xpath_with_ns, ) diff --git a/youtube_dl/extractor/xvideos.py b/youtube_dl/extractor/xvideos.py index e63d4690d..3427ddb96 100644 --- a/youtube_dl/extractor/xvideos.py +++ b/youtube_dl/extractor/xvideos.py @@ -5,9 +5,9 @@ import re from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote from ..utils import ( + ExtractorError, clean_html, determine_ext, - ExtractorError, int_or_none, parse_duration, ) diff --git a/youtube_dl/extractor/xxxymovies.py b/youtube_dl/extractor/xxxymovies.py index e34ebe3a6..1760568a6 100644 --- a/youtube_dl/extractor/xxxymovies.py +++ b/youtube_dl/extractor/xxxymovies.py @@ -3,10 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, -) +from ..utils import int_or_none, parse_duration class XXXYMoviesIE(InfoExtractor): diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py index a17b10d6e..58c1b2eda 100644 --- a/youtube_dl/extractor/yahoo.py +++ b/youtube_dl/extractor/yahoo.py @@ -5,14 +5,12 @@ import hashlib import itertools import re +from .brightcove import BrightcoveNewIE from .common import InfoExtractor, SearchInfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse, -) +from ..compat import compat_str, compat_urllib_parse from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, mimetype2ext, parse_iso8601, @@ -21,8 +19,6 @@ from ..utils import ( url_or_none, ) -from .brightcove import BrightcoveNewIE - class YahooIE(InfoExtractor): IE_DESC = 'Yahoo screen and movies' diff --git a/youtube_dl/extractor/yandexmusic.py b/youtube_dl/extractor/yandexmusic.py index 84969f8e1..3d5bb7792 100644 --- a/youtube_dl/extractor/yandexmusic.py +++ b/youtube_dl/extractor/yandexmusic.py @@ -7,12 +7,7 @@ import re from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - float_or_none, - try_get, -) +from ..utils import ExtractorError, float_or_none, int_or_none, try_get class YandexMusicBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/yandexvideo.py b/youtube_dl/extractor/yandexvideo.py index 6a166ec9b..22988a453 100644 --- a/youtube_dl/extractor/yandexvideo.py +++ b/youtube_dl/extractor/yandexvideo.py @@ -2,12 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - try_get, - url_or_none, -) +from ..utils import determine_ext, int_or_none, try_get, url_or_none class YandexVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/yesjapan.py b/youtube_dl/extractor/yesjapan.py index 681338c96..59e5a760a 100644 --- a/youtube_dl/extractor/yesjapan.py +++ b/youtube_dl/extractor/yesjapan.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - HEADRequest, - get_element_by_attribute, - parse_iso8601, -) +from ..utils import HEADRequest, get_element_by_attribute, parse_iso8601 class YesJapanIE(InfoExtractor): diff --git a/youtube_dl/extractor/ynet.py b/youtube_dl/extractor/ynet.py index c4ae4d88e..67ed93545 100644 --- a/youtube_dl/extractor/ynet.py +++ b/youtube_dl/extractor/ynet.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote_plus diff --git a/youtube_dl/extractor/youjizz.py b/youtube_dl/extractor/youjizz.py index 88aabd272..a4828f23d 100644 --- a/youtube_dl/extractor/youjizz.py +++ b/youtube_dl/extractor/youjizz.py @@ -3,12 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - parse_duration, - url_or_none, -) +from ..utils import determine_ext, int_or_none, parse_duration, url_or_none class YouJizzIE(InfoExtractor): diff --git a/youtube_dl/extractor/younow.py b/youtube_dl/extractor/younow.py index 04dbc87fc..9f8dd526a 100644 --- a/youtube_dl/extractor/younow.py +++ b/youtube_dl/extractor/younow.py @@ -5,11 +5,7 @@ import itertools from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - try_get, -) +from ..utils import ExtractorError, int_or_none, try_get CDN_API_BASE = 'https://cdn.younow.com/php/api' MOMENT_URL_FORMAT = '%s/moment/fetch/id=%%s' % CDN_API_BASE diff --git a/youtube_dl/extractor/yourporn.py b/youtube_dl/extractor/yourporn.py index 98347491e..bf41c7a86 100644 --- a/youtube_dl/extractor/yourporn.py +++ b/youtube_dl/extractor/yourporn.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - parse_duration, - urljoin, -) +from ..utils import parse_duration, urljoin class YourPornIE(InfoExtractor): diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 3d12e2e4a..c39ec2f4f 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -10,10 +10,9 @@ import re import traceback from .common import InfoExtractor, SearchInfoExtractor +from ..compat import compat_chr, compat_HTTPError +from ..compat import compat_map as map from ..compat import ( - compat_chr, - compat_HTTPError, - compat_map as map, compat_parse_qs, compat_str, compat_urllib_parse_unquote_plus, diff --git a/youtube_dl/extractor/zapiks.py b/youtube_dl/extractor/zapiks.py index f6496f516..2fe218f54 100644 --- a/youtube_dl/extractor/zapiks.py +++ b/youtube_dl/extractor/zapiks.py @@ -5,11 +5,11 @@ import re from .common import InfoExtractor from ..utils import ( + int_or_none, parse_duration, parse_iso8601, - xpath_with_ns, xpath_text, - int_or_none, + xpath_with_ns, ) diff --git a/youtube_dl/extractor/zattoo.py b/youtube_dl/extractor/zattoo.py index 6bac3026e..c2a15c1dc 100644 --- a/youtube_dl/extractor/zattoo.py +++ b/youtube_dl/extractor/zattoo.py @@ -5,10 +5,7 @@ import re from uuid import uuid4 from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) +from ..compat import compat_HTTPError, compat_str from ..utils import ( ExtractorError, int_or_none, diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index fcc63ef52..31e0a9939 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -6,13 +6,13 @@ import re from .common import InfoExtractor from ..compat import compat_str from ..utils import ( - determine_ext, + NO_DEFAULT, ExtractorError, + determine_ext, extract_attributes, float_or_none, int_or_none, merge_dicts, - NO_DEFAULT, parse_codecs, qualities, str_or_none, diff --git a/youtube_dl/extractor/zingmp3.py b/youtube_dl/extractor/zingmp3.py index 207c04f5e..cec1c294b 100644 --- a/youtube_dl/extractor/zingmp3.py +++ b/youtube_dl/extractor/zingmp3.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, -) +from ..utils import ExtractorError, int_or_none class ZingMp3BaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/zype.py b/youtube_dl/extractor/zype.py index f20f953cb..14ef1d6b3 100644 --- a/youtube_dl/extractor/zype.py +++ b/youtube_dl/extractor/zype.py @@ -6,8 +6,8 @@ import re from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( - dict_get, ExtractorError, + dict_get, int_or_none, js_to_json, parse_iso8601, diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py index 530a705b4..1c17a373e 100644 --- a/youtube_dl/jsinterp.py +++ b/youtube_dl/jsinterp.py @@ -6,19 +6,17 @@ import math import operator import re +from .compat import compat_basestring +from .compat import compat_collections_chain_map as ChainMap +from .compat import compat_itertools_zip_longest as zip_longest +from .compat import compat_str from .utils import ( - error_to_compat_str, ExtractorError, + error_to_compat_str, js_to_json, remove_quotes, unified_timestamp, ) -from .compat import ( - compat_basestring, - compat_collections_chain_map as ChainMap, - compat_itertools_zip_longest as zip_longest, - compat_str, -) def _js_bit_op(op): diff --git a/youtube_dl/options.py b/youtube_dl/options.py index f6d2b0898..b945e582a 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -1,11 +1,10 @@ from __future__ import unicode_literals -import os.path import optparse +import os.path import re import sys -from .downloader.external import list_external_downloaders from .compat import ( compat_expanduser, compat_get_terminal_size, @@ -13,10 +12,8 @@ from .compat import ( compat_kwargs, compat_shlex_split, ) -from .utils import ( - preferredencoding, - write_string, -) +from .downloader.external import list_external_downloaders +from .utils import preferredencoding, write_string from .version import __version__ diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py index 3ea518399..9aeaf0b82 100644 --- a/youtube_dl/postprocessor/__init__.py +++ b/youtube_dl/postprocessor/__init__.py @@ -1,21 +1,21 @@ from __future__ import unicode_literals from .embedthumbnail import EmbedThumbnailPP +from .execafterdownload import ExecAfterDownloadPP from .ffmpeg import ( - FFmpegPostProcessor, FFmpegEmbedSubtitlePP, FFmpegExtractAudioPP, - FFmpegFixupStretchedPP, FFmpegFixupM3u8PP, FFmpegFixupM4aPP, + FFmpegFixupStretchedPP, FFmpegMergerPP, FFmpegMetadataPP, - FFmpegVideoConvertorPP, + FFmpegPostProcessor, FFmpegSubtitlesConvertorPP, + FFmpegVideoConvertorPP, ) -from .xattrpp import XAttrMetadataPP -from .execafterdownload import ExecAfterDownloadPP from .metadatafromtitle import MetadataFromTitlePP +from .xattrpp import XAttrMetadataPP def get_postprocessor(key): diff --git a/youtube_dl/postprocessor/common.py b/youtube_dl/postprocessor/common.py index 599dd1df2..ec464f155 100644 --- a/youtube_dl/postprocessor/common.py +++ b/youtube_dl/postprocessor/common.py @@ -2,11 +2,7 @@ from __future__ import unicode_literals import os -from ..utils import ( - PostProcessingError, - cli_configuration_args, - encodeFilename, -) +from ..utils import PostProcessingError, cli_configuration_args, encodeFilename class PostProcessor(object): diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dl/postprocessor/embedthumbnail.py index 5e7b6e2df..f2d1b4e10 100644 --- a/youtube_dl/postprocessor/embedthumbnail.py +++ b/youtube_dl/postprocessor/embedthumbnail.py @@ -1,17 +1,15 @@ # coding: utf-8 from __future__ import unicode_literals - import os import subprocess from .ffmpeg import FFmpegPostProcessor - from ..utils import ( + PostProcessingError, check_executable, encodeArgument, encodeFilename, - PostProcessingError, prepend_extension, process_communicate_or_kill, replace_extension, diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dl/postprocessor/execafterdownload.py index 64dabe790..d50bf90d0 100644 --- a/youtube_dl/postprocessor/execafterdownload.py +++ b/youtube_dl/postprocessor/execafterdownload.py @@ -4,10 +4,7 @@ import subprocess from .common import PostProcessor from ..compat import compat_shlex_quote -from ..utils import ( - encodeArgument, - PostProcessingError, -) +from ..utils import PostProcessingError, encodeArgument class ExecAfterDownloadPP(PostProcessor): diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 8c29c8d59..e91f32e02 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -2,29 +2,26 @@ from __future__ import unicode_literals import io import os +import re import subprocess import time -import re - from .common import AudioConversionError, PostProcessor - from ..utils import ( + ISO639Utils, + PostProcessingError, + dfxp2srt, encodeArgument, encodeFilename, get_exe_version, is_outdated_version, - PostProcessingError, prepend_extension, process_communicate_or_kill, + replace_extension, shell_quote, subtitles_filename, - dfxp2srt, - ISO639Utils, - replace_extension, ) - EXT_TO_OUT_FORMATS = { 'aac': 'adts', 'flac': 'flac', diff --git a/youtube_dl/postprocessor/xattrpp.py b/youtube_dl/postprocessor/xattrpp.py index 814dabecf..1320dcd2a 100644 --- a/youtube_dl/postprocessor/xattrpp.py +++ b/youtube_dl/postprocessor/xattrpp.py @@ -3,10 +3,10 @@ from __future__ import unicode_literals from .common import PostProcessor from ..compat import compat_os_name from ..utils import ( - hyphenate_date, - write_xattr, XAttrMetadataError, XAttrUnavailableError, + hyphenate_date, + write_xattr, ) diff --git a/youtube_dl/socks.py b/youtube_dl/socks.py index 5d4adbe72..61ed51619 100644 --- a/youtube_dl/socks.py +++ b/youtube_dl/socks.py @@ -3,20 +3,17 @@ from __future__ import unicode_literals +import collections +import socket + +from .compat import compat_ord, compat_struct_pack, compat_struct_unpack + # References: # SOCKS4 protocol http://www.openssh.com/txt/socks4.protocol # SOCKS4A protocol http://www.openssh.com/txt/socks4a.protocol # SOCKS5 protocol https://tools.ietf.org/html/rfc1928 # SOCKS5 username/password authentication https://tools.ietf.org/html/rfc1929 -import collections -import socket - -from .compat import ( - compat_ord, - compat_struct_pack, - compat_struct_unpack, -) __author__ = 'Timo Schmid ' diff --git a/youtube_dl/swfinterp.py b/youtube_dl/swfinterp.py index 0c7158575..12dd69852 100644 --- a/youtube_dl/swfinterp.py +++ b/youtube_dl/swfinterp.py @@ -4,13 +4,8 @@ import collections import io import zlib -from .compat import ( - compat_str, - compat_struct_unpack, -) -from .utils import ( - ExtractorError, -) +from .compat import compat_str, compat_struct_unpack +from .utils import ExtractorError def _extract_tags(file_contents): diff --git a/youtube_dl/update.py b/youtube_dl/update.py index 84c964617..9789f1e6d 100644 --- a/youtube_dl/update.py +++ b/youtube_dl/update.py @@ -1,17 +1,16 @@ from __future__ import unicode_literals +import hashlib import io import json -import traceback -import hashlib import os import subprocess import sys +import traceback from zipimport import zipimporter from .compat import compat_realpath from .utils import encode_compat_str - from .version import __version__ diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 6fe8098f0..df0d33d15 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -11,8 +11,8 @@ import collections import contextlib import ctypes import datetime -import email.utils import email.header +import email.utils import errno import functools import gzip @@ -38,9 +38,6 @@ import xml.etree.ElementTree import zlib from .compat import ( - compat_HTMLParseError, - compat_HTMLParser, - compat_HTTPError, compat_basestring, compat_chr, compat_collections_abc, @@ -50,7 +47,10 @@ from .compat import ( compat_expanduser, compat_html_entities, compat_html_entities_html5, + compat_HTMLParseError, + compat_HTMLParser, compat_http_client, + compat_HTTPError, compat_integer_types, compat_kwargs, compat_os_name, @@ -61,18 +61,14 @@ from .compat import ( compat_struct_unpack, compat_urllib_error, compat_urllib_parse, + compat_urllib_parse_unquote_plus, compat_urllib_parse_urlencode, compat_urllib_parse_urlparse, - compat_urllib_parse_unquote_plus, compat_urllib_request, compat_urlparse, compat_xpath, ) - -from .socks import ( - ProxyType, - sockssocket, -) +from .socks import ProxyType, sockssocket def register_socks_protocols():