Merge pull request #6428 from dstftw/improve-generic-smil-support

[youtube-dl] / youtube_dl / extractor / southpark.py

diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py
index 83e5a765934d84ae65fbfca74ac8fea6daf201de..87b6504682a4feb50ce65c3eea43d07041aae31c 100644 (file)
--- a/youtube_dl/extractor/southpark.py
+++ b/youtube_dl/extractor/southpark.py
@@ -45,6 +45,14 @@ class SouthParkDeIE(SouthParkIE):
             'title': 'The Government Won\'t Respect My Privacy',
             'description': 'Cartman explains the benefits of "Shitter" to Stan, Kyle and Craig.',
         },
+    }, {
+        # non-ASCII characters in initial URL
+        'url': 'http://www.southpark.de/alle-episoden/s18e09-hashtag-aufwärmen',
+        'playlist_count': 4,
+    }, {
+        # non-ASCII characters in redirect URL
+        'url': 'http://www.southpark.de/alle-episoden/s18e09',
+        'playlist_count': 4,
     }]
 
 
@@ -58,8 +66,9 @@ class SouthParkNlIE(SouthParkIE):
         'playlist_count': 4,
     }]
 
+
 class SouthParkDkIE(SouthParkIE):
-    IE_NAME = 'southpark.dk'
+    IE_NAME = 'southparkstudios.dk'
     _VALID_URL = r'https?://(?:www\.)?(?P<url>southparkstudios\.dk/(?:clips|full-episodes)/(?P<id>.+?)(\?|#|$))'
     _FEED_URL = 'http://www.southparkstudios.dk/feeds/video-player/mrss/'