Merge tag 'upstream/2016.02.22'

[youtubedl] / youtube_dl / extractor / quickvid.py

diff --git a/youtube_dl/extractor/quickvid.py b/youtube_dl/extractor/quickvid.py
index 3bc78060de3b0b4e9051c4ab07e74dc7d7ca5c9c..f414e2384e619e8faccab280bdb9e8a9518819c9 100644 (file)
--- a/youtube_dl/extractor/quickvid.py
+++ b/youtube_dl/extractor/quickvid.py
@@ -3,8 +3,10 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_urlparse,
     compat_urlparse,

+)
+from ..utils import (

     determine_ext,
     int_or_none,
 )
     determine_ext,
     int_or_none,
 )


@@ -22,6 +24,7 @@ class QuickVidIE(InfoExtractor):
             'thumbnail': 're:^https?://.*\.(?:png|jpg|gif)$',
             'view_count': int,
         },
             'thumbnail': 're:^https?://.*\.(?:png|jpg|gif)$',
             'view_count': int,
         },

+        'skip': 'Not accessible from Travis CI server',

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):