Merge "Add __next__() methods to utils iterators for py3"

openstack/swift

Code Issues Proposed changes

Merge "Add next() methods to utils iterators for py3"

Browse Source

This commit is contained in:

Jenkins

2016年01月27日 01:19:37 +00:00

committed by Gerrit Code Review

parent 72736a723d d47155af26

commit d7f8c2297c

2 changed files with 5 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/utils.py

View File

@@ -1081,6 +1081,7 @@ class RateLimitedIterator(object):

self.running_time = ratelimit_sleep(self.running_time,

self.elements_per_second)

return next_value

__next__ = next

class GreenthreadSafeIterator(object):

@@ -1104,6 +1105,7 @@ class GreenthreadSafeIterator(object):

def next(self):

with self.semaphore:

return next(self.unsafe_iter)

__next__ = next

class NullLogger(object):

@@ -1143,6 +1145,7 @@ class LoggerFileObject(object):

def next(self):

raise IOError(errno.EBADF, 'Bad file descriptor')

__next__ = next

def read(self, size=-1):

raise IOError(errno.EBADF, 'Bad file descriptor')

@@ -2318,6 +2321,7 @@ class GreenAsyncPile(object):

rv = self._responses.get()

self._pending -= 1

return rv

__next__ = next

class ModifiedParseResult(ParseResult):

1
test/unit/common/test_utils.py

View File

@@ -3801,6 +3801,7 @@ class UnsafeXrange(object):

return val

finally:

self.concurrent_calls -= 1

__next__ = next

class TestAffinityKeyFunction(unittest.TestCase):

4 swift/common/utils.py Unescape Escape View File

1 test/unit/common/test_utils.py Unescape Escape View File