From ad1f020dfef8cef6dd7f99c032b791e62d08f513 Mon Sep 17 00:00:00 2001 From: Jeremy Low Date: Sun, 10 Jul 2016 16:51:36 -0400 Subject: [PATCH] add sizes attribute to media objects --- tests/test_media.py | 11 ++++++++--- twitter/models.py | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/test_media.py b/tests/test_media.py index 5933589e..6b9be3c7 100644 --- a/tests/test_media.py +++ b/tests/test_media.py @@ -4,10 +4,13 @@ class MediaTest(unittest.TestCase): - + SIZES = {'large': {'h': 175, 'resize': 'fit', 'w': 333}, + 'medium': {'h': 175, 'resize': 'fit', 'w': 333}, + 'small': {'h': 175, 'resize': 'fit', 'w': 333}, + 'thumb': {'h': 150, 'resize': 'crop', 'w': 150}} RAW_JSON = '''{"display_url": "pic.twitter.com/lX5LVZO", "expanded_url": "http://twitter.com/fakekurrik/status/244204973972410368/photo/1", "id": 244204973989187584, "id_str": "244204973989187584", "indices": [44,63], "media_url": "http://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png", "media_url_https": "https://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png", "sizes": {"large": {"h": 175, "resize": "fit", "w": 333}, "medium": {"h": 175, "resize": "fit", "w": 333}, "small": {"h": 175, "resize": "fit", "w": 333}, "thumb": {"h": 150, "resize": "crop", "w": 150}}, "type": "photo", "url": "http://t.co/lX5LVZO"}''' - SAMPLE_JSON = '''{"display_url": "pic.twitter.com/lX5LVZO", "expanded_url": "http://twitter.com/fakekurrik/status/244204973972410368/photo/1", "id": 244204973989187584, "media_url": "http://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png", "media_url_https": "https://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png", "type": "photo", "url": "http://t.co/lX5LVZO"}''' - + SAMPLE_JSON = '''{"display_url": "pic.twitter.com/lX5LVZO", "expanded_url": "http://twitter.com/fakekurrik/status/244204973972410368/photo/1", "id": 244204973989187584, "media_url": "http://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png", "media_url_https": "https://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png", "sizes": {"large": {"h": 175, "resize": "fit", "w": 333}, "medium": {"h": 175, "resize": "fit", "w": 333}, "small": {"h": 175, "resize": "fit", "w": 333}, "thumb": {"h": 150, "resize": "crop", "w": 150}}, "type": "photo", "url": "http://t.co/lX5LVZO"}''' +# '''{"display_url": "pic.twitter.com/lX5LVZO", "expanded_url": "http://twitter.com/fakekurrik/status/244204973972410368/photo/1", "id": 244204973989187584, "media_url": "http://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png", "media_url_https": "https://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png", "type": "photo", "url": "http://t.co/lX5LVZO"}''' def _GetSampleMedia(self): return twitter.Media( id=244204973989187584, @@ -16,6 +19,7 @@ def _GetSampleMedia(self): url='http://t.co/lX5LVZO', media_url_https='https://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png', media_url='http://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png', + sizes=MediaTest.SIZES, type='photo') def testInit(self): @@ -90,6 +94,7 @@ def testEq(self): media.media_url_https = 'https://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png' media.media_url = 'http://pbs.twimg.com/media/A2OXIUcCUAAXj9k.png' media.type = 'photo' + media.sizes = MediaTest.SIZES self.assertEqual(media, self._GetSampleMedia()) diff --git a/twitter/models.py b/twitter/models.py index 9fd20f52..7d4dea37 100644 --- a/twitter/models.py +++ b/twitter/models.py @@ -97,6 +97,7 @@ def __init__(self, **kwargs): 'id': None, 'media_url': None, 'media_url_https': None, + 'sizes': None, 'type': None, 'url': None, }