From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 4 Dec 2013 18:56:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'dstftw/correct-valid-urls'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=29030c0a4c2f4dded5a310add940aae0791f9d73;p=youtube-dl

Merge remote-tracking branch 'dstftw/correct-valid-urls'
---

29030c0a4c2f4dded5a310add940aae0791f9d73
diff --cc youtube_dl/extractor/comedycentral.py
index 53579aa27,caea446ea..a54ce3ee7
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@@ -11,8 -11,8 +11,8 @@@ from ..utils import 
  )
  
  
 -class ComedyCentralIE(MTVIE):
 -    _VALID_URL = r'https?://(?:www\.)?comedycentral\.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
 +class ComedyCentralIE(MTVServicesInfoExtractor):
-     _VALID_URL = r'http://www.comedycentral.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
++    _VALID_URL = r'https?://(?:www.)?comedycentral.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
      _FEED_URL = u'http://comedycentral.com/feeds/mrss/'
  
      _TEST = {
diff --cc youtube_dl/extractor/gametrailers.py
index 3a8bef250,88f656031..d82a5d4b2
--- a/youtube_dl/extractor/gametrailers.py
+++ b/youtube_dl/extractor/gametrailers.py
@@@ -1,11 -1,13 +1,10 @@@
  import re
  
 -from .mtv import MTVIE, _media_xml_tag
 +from .mtv import MTVServicesInfoExtractor
  
 -class GametrailersIE(MTVIE):
 -    """
 -    Gametrailers use the same videos system as MTVIE, it just changes the feed
 -    url, where the uri is and the method to get the thumbnails.
 -    """
 +
 +class GametrailersIE(MTVServicesInfoExtractor):
-     _VALID_URL = r'http://www.gametrailers.com/(?P<type>videos|reviews|full-episodes)/(?P<id>.*?)/(?P<title>.*)'
- 
+     _VALID_URL = r'http://www\.gametrailers\.com/(?P<type>videos|reviews|full-episodes)/(?P<id>.*?)/(?P<title>.*)'
      _TEST = {
          u'url': u'http://www.gametrailers.com/videos/zbvr8i/mirror-s-edge-2-e3-2013--debut-trailer',
          u'file': u'70e9a5d7-cf25-4a10-9104-6f3e7342ae0d.mp4',