Merge branch 'master' into woorst-imgur_api

2017-07-23 01:01:48 -04:00
parent e964cb7ca3 41e10554ae
commit e388591b54
145 changed files with 132727 additions and 119887 deletions
--- a/tests/test_mime_parsers.py
+++ b/tests/test_mime_parsers.py
@@ -69,6 +69,10 @@ URLS = OrderedDict([
        'https://vid.me/rHlb',
        re.compile('https://(.*)\.cloudfront\.net/videos/15694926/52450725.mp4(.*)'),
        'video/mp4')),
+    ('liveleak_video', (
+        'https://www.liveleak.com/view?i=08b_1499296574',
+        re.compile('https://cdn.liveleak.com/80281E/ll_a_s/2017/Jul/5/LiveLeak-dot-com-08b_1499296574-NMHH8690_1499296571.mov.h264_720p.mp4(.*)'),
+        'video/mp4')),
 ])