Compare commits

..

No commits in common. "1e8e5d5238b4863aa2005d1cd5981343d96bdbf3" and "7c2d18a13f7eaa4008923ad73ed8e938229db848" have entirely different histories.

3 changed files with 1 additions and 4 deletions

View File

@ -1,5 +1,5 @@
name: CI
on: [push, pull_request]
on: [push]
jobs:
tests:
name: Tests

View File

@ -464,7 +464,6 @@ class TestFormatSelection(unittest.TestCase):
assert_syntax_error('+bestaudio')
assert_syntax_error('bestvideo+')
assert_syntax_error('/')
assert_syntax_error('bestvideo+bestvideo+bestaudio')
def test_format_filtering(self):
formats = [

View File

@ -1226,8 +1226,6 @@ class YoutubeDL(object):
group = _parse_format_selection(tokens, inside_group=True)
current_selector = FormatSelector(GROUP, group, [])
elif string == '+':
if inside_merge:
raise syntax_error('Unexpected "+"', start)
video_selector = current_selector
audio_selector = _parse_format_selection(tokens, inside_merge=True)
if not video_selector or not audio_selector: