diff options
author | Anthony King <anthonydking@slimroms.net> | 2014-05-05 21:24:05 +0100 |
---|---|---|
committer | Anthony King <anthonydking@slimroms.net> | 2014-05-07 08:44:20 +0100 |
commit | 2cd1f0452eb746ae727218f5dbda0fd1ae0b2e34 (patch) | |
tree | dd8ee9139452c6eb3c759f199cab78d762545cdf | |
parent | 65e3a78a9e9336dae396cef09b8b23621f4bdc6e (diff) | |
download | git-repo-2cd1f0452eb746ae727218f5dbda0fd1ae0b2e34.tar.gz |
Use next(iterator) rather than iterator.next()
iterator.next() was replaced with iterator.__next__() in Python 3.
Use next(iterator) instead which will select the correct method for
returning the next item.
Change-Id: I6d0c89c8b32e817e5897fe87332933dacf22027b
-rw-r--r-- | project.py | 6 | ||||
-rw-r--r-- | subcmds/status.py | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -2321,8 +2321,8 @@ class Project(object): | |||
2321 | out = iter(out[:-1].split('\0')) # pylint: disable=W1401 | 2321 | out = iter(out[:-1].split('\0')) # pylint: disable=W1401 |
2322 | while out: | 2322 | while out: |
2323 | try: | 2323 | try: |
2324 | info = out.next() | 2324 | info = next(out) |
2325 | path = out.next() | 2325 | path = next(out) |
2326 | except StopIteration: | 2326 | except StopIteration: |
2327 | break | 2327 | break |
2328 | 2328 | ||
@@ -2348,7 +2348,7 @@ class Project(object): | |||
2348 | info = _Info(path, *info) | 2348 | info = _Info(path, *info) |
2349 | if info.status in ('R', 'C'): | 2349 | if info.status in ('R', 'C'): |
2350 | info.src_path = info.path | 2350 | info.src_path = info.path |
2351 | info.path = out.next() | 2351 | info.path = next(out) |
2352 | r[info.path] = info | 2352 | r[info.path] = info |
2353 | return r | 2353 | return r |
2354 | finally: | 2354 | finally: |
diff --git a/subcmds/status.py b/subcmds/status.py index 41c4429a..b42675e0 100644 --- a/subcmds/status.py +++ b/subcmds/status.py | |||
@@ -113,7 +113,7 @@ the following meanings: | |||
113 | try: | 113 | try: |
114 | state = project.PrintWorkTreeStatus(output) | 114 | state = project.PrintWorkTreeStatus(output) |
115 | if state == 'CLEAN': | 115 | if state == 'CLEAN': |
116 | clean_counter.next() | 116 | next(clean_counter) |
117 | finally: | 117 | finally: |
118 | sem.release() | 118 | sem.release() |
119 | 119 | ||
@@ -141,7 +141,7 @@ the following meanings: | |||
141 | for project in all_projects: | 141 | for project in all_projects: |
142 | state = project.PrintWorkTreeStatus() | 142 | state = project.PrintWorkTreeStatus() |
143 | if state == 'CLEAN': | 143 | if state == 'CLEAN': |
144 | counter.next() | 144 | next(counter) |
145 | else: | 145 | else: |
146 | sem = _threading.Semaphore(opt.jobs) | 146 | sem = _threading.Semaphore(opt.jobs) |
147 | threads_and_output = [] | 147 | threads_and_output = [] |
@@ -164,7 +164,7 @@ the following meanings: | |||
164 | t.join() | 164 | t.join() |
165 | output.dump(sys.stdout) | 165 | output.dump(sys.stdout) |
166 | output.close() | 166 | output.close() |
167 | if len(all_projects) == counter.next(): | 167 | if len(all_projects) == next(counter): |
168 | print('nothing to commit (working directory clean)') | 168 | print('nothing to commit (working directory clean)') |
169 | 169 | ||
170 | if opt.orphans: | 170 | if opt.orphans: |