diff --git a/youtube_dl/extractor/democracynow.py b/youtube_dl/extractor/democracynow.py
index 1c9b36052..973bb437b 100644
--- a/youtube_dl/extractor/democracynow.py
+++ b/youtube_dl/extractor/democracynow.py
@@ -1,19 +1,7 @@
# coding: utf-8
from __future__ import unicode_literals
-import json
-import time
-import hmac
-import hashlib
-import itertools
import re
-from ..utils import (
- ExtractorError,
- int_or_none,
- parse_age_limit,
- parse_iso8601,
-)
-from ..compat import compat_urllib_request
from .common import InfoExtractor
@@ -30,7 +18,7 @@ class DemocracynowIE(InfoExtractor):
'uploader': 'Democracy Now',
'upload_date': None,
},
- },{
+ }, {
'url': 'http://www.democracynow.org/2015/7/3/this_flag_comes_down_today_bree',
'info_dict': {
'id': '2015-0703-001',
@@ -40,7 +28,6 @@ class DemocracynowIE(InfoExtractor):
'uploader': 'Democracy Now',
'upload_date': None,
},
-
}]
def _real_extract(self, url):
@@ -49,7 +36,7 @@ class DemocracynowIE(InfoExtractor):
if display_id == '':
display_id = 'home'
webpage = self._download_webpage(url, display_id)
- re_desc = re.search(r'[^/]+)/(?:dn)?(?P[^/]+?)\.(?P[^\.\?]+)(?P\?|$)',url)
- if video_id == None:
+ purl = re.search(r'/(?P[^/]+)/(?:dn)?(?P[^/]+?)\.(?P[^\.\?]+)(?P\?|$)', url)
+ if video_id is None:
video_id = purl.group('fn')
- if js.get('start') != None:
+ if js.get('start') is not None:
url += '&' if purl.group('hasparams') == '?' else '?'
- url = url + 'start='+str(js.get('start'))
+ url = url + 'start=' + str(js.get('start'))
formats.append({
'format_id': purl.group('dir'),
'ext': purl.group('ext'),
@@ -92,9 +79,7 @@ class DemocracynowIE(InfoExtractor):
'title': js.get('title'),
'description': description,
'uploader': 'Democracy Now',
-# 'thumbnails': thumbnails,
'subtitles': subtitles,
'formats': formats,
}
return ret
-#
\ No newline at end of file