Skip to content

Commit

Permalink
Merge pull request #65 from somsak/master
Browse files Browse the repository at this point in the history
Fix bugs in resolution attribute and dumps function.
  • Loading branch information
leandromoreira committed Oct 20, 2015
2 parents 10dcac7 + 58a8648 commit b6662a4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion m3u8/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ def dumps(self, last_segment):
return ''.join(output)

def __str__(self):
return self.dumps()
return self.dumps(None)


class SegmentList(list, GroupedBasePathMixin):
Expand Down Expand Up @@ -469,6 +469,7 @@ def __init__(self, uri, stream_info, media, base_uri):

resolution = stream_info.get('resolution')
if resolution != None:
resolution = resolution.strip('"')
values = resolution.split('x')
resolution_pair = (int(values[0]), int(values[1]))
else:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
name="m3u8",
author='Globo.com',
author_email='[email protected]',
version="0.2.7",
version="0.2.8",
zip_safe=False,
include_package_data=True,
install_requires=install_reqs,
Expand Down

0 comments on commit b6662a4

Please sign in to comment.