From 1339ecb2f8cfe96821ba6284cd470e846634f110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Sun, 14 May 2017 04:30:29 +0700
Subject: [PATCH] [orf:radio] Cleanup _VALID_URLs (closes #11643)

---
 youtube_dl/extractor/orf.py | 62 +++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/youtube_dl/extractor/orf.py b/youtube_dl/extractor/orf.py
index 10e4a2e1c..cc296eabd 100644
--- a/youtube_dl/extractor/orf.py
+++ b/youtube_dl/extractor/orf.py
@@ -182,46 +182,42 @@ def extract_entry_dict(info, title, subtitle):
 class ORFFM4IE(ORFRadioIE):
     IE_NAME = 'orf:fm4'
     IE_DESC = 'radio FM4'
-    _VALID_URL = r'https?://(?P<station>fm4)\.orf\.at/(?:7tage/?#|player/)(?P<date>[0-9]+)/(?P<show>\w+)'
+    _VALID_URL = r'https?://(?P<station>fm4)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
 
-    _TESTS = [
-        {
-            'url': 'http://fm4.orf.at/player/20170107/CC',
-            'md5': '2b0be47375432a7ef104453432a19212',
-            'info_dict': {
-                'id': '2017-01-07_2100_tl_54_7DaysSat18_31295',
-                'ext': 'mp3',
-                'title': 'Solid Steel Radioshow',
-                'description': 'Die Mixshow von Coldcut und Ninja Tune.',
-                'duration': 3599,
-                'timestamp': 1483819257,
-                'upload_date': '20170107',
-            },
-            'skip': 'Shows from ORF radios are only available for 7 days.'
-        }
-    ]
+    _TEST = {
+        'url': 'http://fm4.orf.at/player/20170107/CC',
+        'md5': '2b0be47375432a7ef104453432a19212',
+        'info_dict': {
+            'id': '2017-01-07_2100_tl_54_7DaysSat18_31295',
+            'ext': 'mp3',
+            'title': 'Solid Steel Radioshow',
+            'description': 'Die Mixshow von Coldcut und Ninja Tune.',
+            'duration': 3599,
+            'timestamp': 1483819257,
+            'upload_date': '20170107',
+        },
+        'skip': 'Shows from ORF radios are only available for 7 days.'
+    }
 
 
 class ORFOE1IE(ORFRadioIE):
     IE_NAME = 'orf:oe1'
     IE_DESC = 'Radio Österreich 1'
-    _VALID_URL = r'https?://(?P<station>oe1)\.orf\.at/(?:7tage/?#|player/)(?P<date>[0-9]+)/(?P<show>\w+)'
+    _VALID_URL = r'https?://(?P<station>oe1)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
 
-    _TESTS = [
-       {
-            'url': 'http://oe1.orf.at/player/20170108/456544',
-            'md5': '34d8a6e67ea888293741c86a099b745b',
-            'info_dict': {
-                'id': '2017-01-08_0759_tl_51_7DaysSun6_256141',
-                'ext': 'mp3',
-                'title': 'Morgenjournal',
-                'duration': 609,
-                'timestamp': 1483858796,
-                'upload_date': '20170108',
-            },
-            'skip': 'Shows from ORF radios are only available for 7 days.'
-        }
-    ]
+    _TEST = {
+        'url': 'http://oe1.orf.at/player/20170108/456544',
+        'md5': '34d8a6e67ea888293741c86a099b745b',
+        'info_dict': {
+            'id': '2017-01-08_0759_tl_51_7DaysSun6_256141',
+            'ext': 'mp3',
+            'title': 'Morgenjournal',
+            'duration': 609,
+            'timestamp': 1483858796,
+            'upload_date': '20170108',
+        },
+        'skip': 'Shows from ORF radios are only available for 7 days.'
+    }
 
 
 class ORFIPTVIE(InfoExtractor):