From 66766c24670d318df8a7b7c4e6830dae0f75435f Mon Sep 17 00:00:00 2001 From: Jeremy Low Date: Fri, 29 Jul 2016 17:26:30 -0400 Subject: [PATCH 1/3] fix issue 374 where tweet_volume data was not being populated on Trend instantiation --- doc/changelog.rst | 8 ++++++++ testdata/models/models_trend.json | 2 +- tests/test_models.py | 1 + twitter/models.py | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/changelog.rst b/doc/changelog.rst index e3a99248..0390e691 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -1,6 +1,14 @@ Changelog --------- +Version 3.2 +=========== + +What's Changed +-------------- + +* :py:func:`twitter.models.Trend`'s `volume` attribute has been renamed `tweet_volume` in line with Twitter's naming convention. This change should allow users to access the number of tweets being tweeted for a given Trend. + Version 3.1 ========== diff --git a/testdata/models/models_trend.json b/testdata/models/models_trend.json index 17100138..f7c09a74 100644 --- a/testdata/models/models_trend.json +++ b/testdata/models/models_trend.json @@ -1 +1 @@ -{"name":"#ChangeAConsonantSpoilAMovie","url":"http:\\/\\/twitter.com\\/search?q=%23ChangeAConsonantSpoilAMovie","promoted_content":null,"query":"%23ChangeAConsonantSpoilAMovie","tweet_volume":null} \ No newline at end of file +{"name":"#ChangeAConsonantSpoilAMovie","url":"http:\\/\\/twitter.com\\/search?q=%23ChangeAConsonantSpoilAMovie","promoted_content":null,"query":"%23ChangeAConsonantSpoilAMovie","tweet_volume":104403} \ No newline at end of file diff --git a/tests/test_models.py b/tests/test_models.py index 6e212278..48394d93 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -116,6 +116,7 @@ def test_trend(self): self.fail(e) self.assertTrue(trend.AsJsonString()) self.assertTrue(trend.AsDict()) + self.assertEqual(trend.tweet_volume, 104403) def test_url(self): url = twitter.Url.NewFromJsonDict(self.URL_SAMPLE_JSON) diff --git a/twitter/models.py b/twitter/models.py index 7d4dea37..11515d13 100644 --- a/twitter/models.py +++ b/twitter/models.py @@ -208,7 +208,7 @@ def __init__(self, **kwargs): 'query': None, 'timestamp': None, 'url': None, - 'volume': None, + 'tweet_volume': None, } for (param, default) in self.param_defaults.items(): From 43afa6995ccc5013b0e93f07d1fdfc2c1be5e836 Mon Sep 17 00:00:00 2001 From: Jeremy Low Date: Fri, 29 Jul 2016 17:33:50 -0400 Subject: [PATCH 2/3] adds volume property to Trend objects for backwards compatibility --- twitter/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/twitter/models.py b/twitter/models.py index 11515d13..7e130b3c 100644 --- a/twitter/models.py +++ b/twitter/models.py @@ -220,6 +220,10 @@ def __repr__(self): self.timestamp, self.url) + @property + def volume(self): + return self.tweet_volume + class Hashtag(TwitterModel): From 138ca2e61e24b478bd51e9872a94d5f8b77cd01c Mon Sep 17 00:00:00 2001 From: Jeremy Low Date: Fri, 29 Jul 2016 17:42:33 -0400 Subject: [PATCH 3/3] add test for trend.volume property --- tests/test_models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_models.py b/tests/test_models.py index 48394d93..190fcc34 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -117,6 +117,7 @@ def test_trend(self): self.assertTrue(trend.AsJsonString()) self.assertTrue(trend.AsDict()) self.assertEqual(trend.tweet_volume, 104403) + self.assertEqual(trend.volume, trend.tweet_volume) def test_url(self): url = twitter.Url.NewFromJsonDict(self.URL_SAMPLE_JSON)