← Back to branch summary

~ubuntu-branches/ubuntu/vivid/swift/vivid

« back to all changes in this revision

Viewing changes to swift/proxy/controllers/obj.py

  • Committer: Package Import Robot
  • Author(s): James Page, Chuck Short, James Page
  • Date: 2014-12-19 14:33:19 UTC
  • mfrom: (1.2.34)
  • Revision ID: package-import@ubuntu.com-20141219143319-kbs2wk1dixt2aoqq
Tags: 2.2.1-0ubuntu1
[ Chuck Short ]
* Open for Vivid.
* d/control: Update branch locations.

[ James Page ]
* New upstream release:
  - d/p/*: Refresh.
* d/control: Bumped Standards-Version 3.9.6, no changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
swift/proxy/controllers/obj.py
132
132
            marker = sublisting[-1]['name'].encode('utf-8')
133
133
            yield sublisting
134
134
 
135
 
    def _remaining_items(self, listing_iter):
136
 
        """
137
 
        Returns an item-by-item iterator for a page-by-page iterator
138
 
        of item listings.
139
 
 
140
 
        Swallows listing-related errors; this iterator is only used
141
 
        after we've already started streaming a response to the
142
 
        client, and so if we start getting errors from the container
143
 
        servers now, it's too late to send an error to the client, so
144
 
        we just quit looking for segments.
145
 
        """
146
 
        try:
147
 
            for page in listing_iter:
148
 
                for item in page:
149
 
                    yield item
150
 
        except ListingIterNotFound:
151
 
            pass
152
 
        except ListingIterError:
153
 
            pass
154
 
        except ListingIterNotAuthorized:
155
 
            pass
156
 
 
157
135
    def iter_nodes_local_first(self, ring, partition):
158
136
        """
159
137
        Yields nodes for a ring partition.