summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-19 06:14:24 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-19 06:14:24 +0100
commitce4e242a6f360e9b7cbf9675d55a14eb1e595a7f (patch)
tree0c361384c67dda7d071f01286021fc4da933b830
parentb27bec212faa0e0d17faa09ee3b88919397abd55 (diff)
downloadyoutube-dl-ce4e242a6f360e9b7cbf9675d55a14eb1e595a7f.tar.gz
youtube-dl-ce4e242a6f360e9b7cbf9675d55a14eb1e595a7f.tar.xz
youtube-dl-ce4e242a6f360e9b7cbf9675d55a14eb1e595a7f.zip
[dropbox] PEP8 and simplify (#2171)
-rw-r--r--youtube_dl/extractor/dropbox.py36
1 files changed, 17 insertions, 19 deletions
diff --git a/youtube_dl/extractor/dropbox.py b/youtube_dl/extractor/dropbox.py
index e4d60d17a..44f827e89 100644
--- a/youtube_dl/extractor/dropbox.py
+++ b/youtube_dl/extractor/dropbox.py
@@ -5,28 +5,26 @@ import re
 
 from .common import InfoExtractor
 
+
 class DropboxIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)'
     _TEST = {
-        u'url': u'https://www.dropbox.com/s/mcnzehi9wo55th4/20131219_085616.mp4',
-        u'file': u'mcnzehi9wo55th4.mp4',
-        u'md5': u'2cec58eb277054eca0dbaaf3bdc72564',
-        u'info_dict': {
-            u'title': '20131219_085616'
+        'url': 'https://www.dropbox.com/s/mcnzehi9wo55th4/20131219_085616.mp4',
+        'file': 'mcnzehi9wo55th4.mp4',
+        'md5': '2cec58eb277054eca0dbaaf3bdc72564',
+        'info_dict': {
+            'title': '20131219_085616'
         }
     }
-    
-    
-    def _real_extract(self,url):
+
+    def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        video_id=mobj.group('id')
-        title=mobj.group('title')
-        webpage = self._download_webpage(url, video_id)
-        video_url=url+'?dl=1'
-        return{
-               'id':video_id,
-               'title':title,
-               'url':video_url
-               
-               }
-        
\ No newline at end of file
+        video_id = mobj.group('id')
+        title = mobj.group('title')
+        video_url = url + '?dl=1'
+
+        return {
+            'id': video_id,
+            'title': title,
+            'url': video_url,
+        }