[orf:radio] Cleanup _VALID_URLs (closes #11643)

youtube_dl/extractor/orf.py

@@ -182,10 +182,9 @@ class ORFRadioIE(InfoExtractor):
 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 = [
+    _TEST = {
-        {
         'url': 'http://fm4.orf.at/player/20170107/CC',
         'md5': '2b0be47375432a7ef104453432a19212',
         'info_dict': {
@@ -199,16 +198,14 @@ class ORFFM4IE(ORFRadioIE):
         },
         '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 = [
+    _TEST = {
-       {
         'url': 'http://oe1.orf.at/player/20170108/456544',
         'md5': '34d8a6e67ea888293741c86a099b745b',
         'info_dict': {
@@ -221,7 +218,6 @@ class ORFOE1IE(ORFRadioIE):
         },
         'skip': 'Shows from ORF radios are only available for 7 days.'
     }
-    ]
 
 
 class ORFIPTVIE(InfoExtractor):