Skip to content

Commit

Permalink
Removing unused method: _remaining_items
Browse files Browse the repository at this point in the history
Removing method _remaining_items from object controller class.

The only caller to this function was removed as part of the
work to move all DLO functionality to middleware:
https://review.openstack.org/63326

Change-Id: I7fbc208746bba8142ae51bf27cfa1979cae00301
Signed-off-by: Thiago da Silva <thiago@redhat.com>
  • Loading branch information
Thiago da Silva committed Dec 2, 2014
1 parent 07f16dc commit dfd7843
Showing 1 changed file with 0 additions and 22 deletions.
22 changes: 0 additions & 22 deletions swift/proxy/controllers/obj.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,28 +132,6 @@ def _listing_pages_iter(self, lcontainer, lprefix, env):
marker = sublisting[-1]['name'].encode('utf-8')
yield sublisting

def _remaining_items(self, listing_iter):
"""
Returns an item-by-item iterator for a page-by-page iterator
of item listings.
Swallows listing-related errors; this iterator is only used
after we've already started streaming a response to the
client, and so if we start getting errors from the container
servers now, it's too late to send an error to the client, so
we just quit looking for segments.
"""
try:
for page in listing_iter:
for item in page:
yield item
except ListingIterNotFound:
pass
except ListingIterError:
pass
except ListingIterNotAuthorized:
pass

def iter_nodes_local_first(self, ring, partition):
"""
Yields nodes for a ring partition.
Expand Down

0 comments on commit dfd7843

Please sign in to comment.