Skip to content

Handle subscription list for specific topic separately. #1411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andrazhribernik wants to merge 4 commits into from
Closed

Handle subscription list for specific topic separately. #1411

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3dc9cc0
Handle subscription list for specific topic separately.
andrazhribernik Jan 21, 2016
856a09e
Merge pull request #1 from cytora/bug-fix-pubsub-list-subscriptions
peterhudec Jan 21, 2016
08064bc
Upgrade version in setup.py
andrazhribernik Jan 21, 2016
4d016a4
Downgrade version.
andrazhribernik Jan 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Handle subscription list for specific topic separately. 
Update code
  • Loading branch information
@andrazhribernik
andrazhribernik committed Jan 21, 2016
commit 3dc9cc0df85f1acc90b921378f893fedd5ee6004
13 changes: 10 additions & 3 deletions gcloud/pubsub/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down