aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRogério Brito <rbrito@ime.usp.br>2017-02-09 05:30:45 -0200
committerRogério Brito <rbrito@ime.usp.br>2017-02-09 05:30:45 -0200
commitd2632ebbe0759622d4ab7aff134421194974b394 (patch)
tree3b51ea6cba4c9158632c32fc80566079b74f45ef
parentef2d059988ee523e76933953419ba32637860796 (diff)
downloadyoutube-dl-d2632ebbe0759622d4ab7aff134421194974b394.zip
youtube-dl-d2632ebbe0759622d4ab7aff134421194974b394.tar.gz
youtube-dl-d2632ebbe0759622d4ab7aff134421194974b394.tar.bz2
debian/patches: Drop patch included in version 2017.02.07.
-rw-r--r--debian/patches/fix_youtube_extraction.patch22
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 23 deletions
diff --git a/debian/patches/fix_youtube_extraction.patch b/debian/patches/fix_youtube_extraction.patch
deleted file mode 100644
index e3ba6e5..0000000
--- a/debian/patches/fix_youtube_extraction.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d1aeacd9bfe12bdf064d8888f77ccf8bd30f1723 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
-Date: Tue, 10 Jan 2017 21:25:29 +0700
-Subject: [PATCH] [youtube] Fix extraction (closes #11663, #11664)
-
----
- youtube_dl/jsinterp.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py
-index a8df4ae..24cdec2 100644
---- a/youtube_dl/jsinterp.py
-+++ b/youtube_dl/jsinterp.py
-@@ -213,7 +213,7 @@ def interpret_expression(self, expr, local_vars, allow_recursion):
- def extract_object(self, objname):
- obj = {}
- obj_m = re.search(
-- (r'(?:var\s+)?%s\s*=\s*\{' % re.escape(objname)) +
-+ (r'(?<!this\.)%s\s*=\s*\{' % re.escape(objname)) +
- r'\s*(?P<fields>([a-zA-Z$0-9]+\s*:\s*function\(.*?\)\s*\{.*?\}(?:,\s*)?)*)' +
- r'\}\s*;',
- self.code)
diff --git a/debian/patches/series b/debian/patches/series
index 43a336f..21895fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
skip_support_file_installation.patch
fix_libav_compat_outdated.patch
-fix_youtube_extraction.patch