X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftvplay.py;h=99ff82a5d4f5c8c9f99b1d415edd9b2c4c3c0d7f;hb=8d81f3e36d3caaeabcdff99d3340d4075d30741e;hp=5548ff2acc0e0bd39051d69acaddd86dd96e3c4e;hpb=2cb93afcd8a8a1f086a97ef3791fa033ddc1610a;p=youtube-dl

diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dl/extractor/tvplay.py
index 5548ff2ac..99ff82a5d 100644
--- a/youtube_dl/extractor/tvplay.py
+++ b/youtube_dl/extractor/tvplay.py
@@ -16,7 +16,6 @@ from ..utils import (
     parse_iso8601,
     qualities,
     try_get,
-    js_to_json,
     update_url_query,
 )
 
@@ -226,7 +225,11 @@ class TVPlayIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-
+        geo_country = self._search_regex(
+            r'https?://[^/]+\.([a-z]{2})', url,
+            'geo country', default=None)
+        if geo_country:
+            self._initialize_geo_bypass([geo_country.upper()])
         video = self._download_json(
             'http://playapi.mtgx.tv/v3/videos/%s' % video_id, video_id, 'Downloading video JSON')
 
@@ -370,7 +373,7 @@ class ViafreeIE(InfoExtractor):
         'add_ie': [TVPlayIE.ie_key()],
     }, {
         # Different og:image URL schema
-        'url': 'www.viafree.se/program/reality/sommaren-med-youtube-stjarnorna/sasong-1/avsnitt-2',
+        'url': 'http://www.viafree.se/program/reality/sommaren-med-youtube-stjarnorna/sasong-1/avsnitt-2',
         'only_matching': True,
     }, {
         'url': 'http://www.viafree.no/programmer/underholdning/det-beste-vorspielet/sesong-2/episode-1',