Merge pull request #21 from feuvan/master

Multiple key support, IFrame playlist support
globocom · Oct 6, 2015 · 836bafb · 836bafb
2 parents 707d212 + 5188097
commit 836bafb
Show file tree

Hide file tree

Showing 6 changed files with 430 additions and 8 deletions.
diff --git a/m3u8/__init__.py b/m3u8/__init__.py
@@ -18,12 +18,19 @@
     from urllib.request import urlopen as url_opener
     urlopen = url_opener
 
+<<<<<<< HEAD
+from m3u8.model import M3U8, Playlist, IFramePlaylist
+from m3u8.parser import parse, is_url
+
+__all__ = 'M3U8', 'Playlist', 'IFramePlaylist', 'loads', 'load', 'parse'
+=======
 
 from m3u8.model import M3U8, Playlist, IFramePlaylist, Media, Segment
 from m3u8.parser import parse, is_url, ParseError
 
 __all__ = ('M3U8', 'Playlist', 'IFramePlaylist', 'Media',
            'Segment', 'loads', 'load', 'parse', 'ParseError')
+>>>>>>> globocom/master
 
 def loads(content):
     '''