openstack/swift
Code Issues Proposed changes

Stop shadowing built-in iter

Browse Source 
Change-Id: I0e3fcddfef6968353e4c0aa6871a2e7a22598459
This commit is contained in:
Tim Burke
2016-11-08 12:32:18 -08:00
parent 78527aaf7a
commit 5de9747e16
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/common/test_manager.py
View File

@@ -605,12 +605,12 @@ class TestServer(unittest.TestCase):
manager.RUN_DIR = t manager.RUN_DIR = t
server = manager.Server('proxy', run_dir=t) server = manager.Server('proxy', run_dir=t)
# test get one file # test get one file
iter = server.iter_pid_files() iterator = server.iter_pid_files()
pid_file, pid = next(iter) pid_file, pid = next(iterator)
self.assertEqual(pid_file, self.join_run_dir('proxy-server.pid')) self.assertEqual(pid_file, self.join_run_dir('proxy-server.pid'))
self.assertEqual(pid, 1) self.assertEqual(pid, 1)
# ... and only one file # ... and only one file
self.assertRaises(StopIteration, iter.next) self.assertRaises(StopIteration, iterator.next)
# test invalid value in pid file # test invalid value in pid file
server = manager.Server('auth', run_dir=t) server = manager.Server('auth', run_dir=t)
pid_file, pid = next(server.iter_pid_files()) pid_file, pid = next(server.iter_pid_files())