From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 24 Aug 2014 05:02:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'olebowle/gameone'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=11f75cac3db14681b306633a496e9aaae2cfc0a7

Merge remote-tracking branch 'olebowle/gameone'
---

11f75cac3db14681b306633a496e9aaae2cfc0a7
diff --cc test/test_playlists.py
index 6448fea38,3bc353604..0691ff110
--- a/test/test_playlists.py
+++ b/test/test_playlists.py
@@@ -405,7 -394,15 +406,15 @@@ class TestPlaylists(unittest.TestCase)
          result = ie.extract('http://www.teachertube.com/user/profile/rbhagwati2')
          self.assertIsPlaylist(result)
          self.assertEqual(result['id'], 'rbhagwati2')
 -        self.assertTrue(len(result['entries']) >= 179)
 +        assertGreaterEqual(self, len(result['entries']), 179)
  
+     def test_GameOne_playlist(self):
+         dl = FakeYDL()
+         ie = GameOnePlaylistIE(dl)
+         result = ie.extract('http://www.gameone.de/tv')
+         self.assertIsPlaylist(result)
+         self.assertEqual(result['title'], 'GameOne')
+         assertGreaterEqual(self, len(result['entries']), 294)
+ 
  if __name__ == '__main__':
      unittest.main()
diff --cc youtube_dl/extractor/__init__.py
index 0203d9d63,17b695a56..de6e8ee30
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -116,9 -106,11 +116,12 @@@ from .freesound import FreesoundI
  from .freespeech import FreespeechIE
  from .funnyordie import FunnyOrDieIE
  from .gamekings import GamekingsIE
- from .gameone import GameOneIE
+ from .gameone import (
+     GameOneIE,
+     GameOnePlaylistIE,
+ )
  from .gamespot import GameSpotIE
 +from .gamestar import GameStarIE
  from .gametrailers import GametrailersIE
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE