From 3dfd25b3aa608e175d5f16b6e0cc7fe82b8ad7ac Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 11 Jul 2014 11:01:59 +0200
Subject: [PATCH] [goshgay] PEP8 and test for age_limit (#3220)
---
youtube_dl/extractor/goshgay.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/goshgay.py b/youtube_dl/extractor/goshgay.py
index 3f31ec896..7bca21ad0 100644
--- a/youtube_dl/extractor/goshgay.py
+++ b/youtube_dl/extractor/goshgay.py
@@ -22,6 +22,7 @@ class GoshgayIE(InfoExtractor):
'ext': 'flv',
'title': 'md5:089833a4790b5e103285a07337f245bf',
'thumbnail': 're:http://.*\.jpg',
+ 'age_limit': 18,
}
}
@@ -32,8 +33,8 @@ class GoshgayIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
title = self._search_regex(r'class="video-title"><h1>(.+?)<', webpage, 'title')
- player_config = self._search_regex(r'jwplayer\("player"\)\.setup\(({.+?})\)', webpage, 'config settings',
- fatal=True, flags=re.S)
+ player_config = self._search_regex(
+ r'(?s)jwplayer\("player"\)\.setup\(({.+?})\)', webpage, 'config settings')
player_vars = json.loads(player_config.replace("'", '"'))
width = str_to_int(player_vars.get('width'))
height = str_to_int(player_vars.get('height'))