From 3dc9cc0df85f1acc90b921378f893fedd5ee6004 Mon Sep 17 00:00:00 2001 From: Andraz Hribernik Date: Thu, 21 Jan 2016 09:45:40 +0000 Subject: [PATCH 1/3] Handle subscription list for specific topic separately. Update code --- gcloud/pubsub/client.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gcloud/pubsub/client.py b/gcloud/pubsub/client.py index 3a47e6d6a8a0..f3206a978b2f 100644 --- a/gcloud/pubsub/client.py +++ b/gcloud/pubsub/client.py @@ -126,9 +126,16 @@ def list_subscriptions(self, page_size=None, page_token=None, resp = self.connection.api_request(method='GET', path=path, query_params=params) topics = {} - subscriptions = [Subscription.from_api_repr(resource, self, - topics=topics) - for resource in resp['subscriptions']] + subscriptions = [] + for resource in resp['subscriptions']: + if 'topic' in resource and len(resource['topic'].split('/')) == 4: + subscriptions.append(Subscription.from_api_repr(resource, self, topics=topics)) + elif topic_name and len(resource.split('/')) == 4: + subscription_name = resource.split('/')[3] + subscriptions.append(Subscription( + name=subscription_name, + topic=self.topic(topic_name) + )) return subscriptions, resp.get('nextPageToken') def topic(self, name, timestamp_messages=False): From 08064bc6a119662d3abacb7b4bd63ccddacacd52 Mon Sep 17 00:00:00 2001 From: Andraz Hribernik Date: Thu, 21 Jan 2016 14:14:27 +0000 Subject: [PATCH 2/3] Upgrade version in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0cd32748c562..55198c15d242 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( name='gcloud', - version='0.8.0', + version='0.8.1', description='API Client library for Google Cloud', author='Google Cloud Platform', author_email='jjg+gcloud-python@google.com', From 4d016a4f022bddc923227807d3c2e5314c27c82d Mon Sep 17 00:00:00 2001 From: Andraz Hribernik Date: Sun, 31 Jan 2016 15:40:02 +0000 Subject: [PATCH 3/3] Downgrade version. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 55198c15d242..0cd32748c562 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( name='gcloud', - version='0.8.1', + version='0.8.0', description='API Client library for Google Cloud', author='Google Cloud Platform', author_email='jjg+gcloud-python@google.com',