[python-debian/master 23/36] Use next(iterator) rather than iterator.next().
Colin Watson
cjwatson at canonical.com
Mon Oct 8 07:41:24 UTC 2012
---
lib/debian/deb822.py | 2 +-
tests/test_deb822.py | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
index 2efa56f..d57ae0d 100644
--- a/lib/debian/deb822.py
+++ b/lib/debian/deb822.py
@@ -797,7 +797,7 @@ class GpgInfo(dict):
# Peek at the first line to see if it's newline-terminated.
sequence_iter = iter(sequence)
try:
- first_line = sequence_iter.next()
+ first_line = next(sequence_iter)
except StopIteration:
return ""
join_str = '\n'
diff --git a/tests/test_deb822.py b/tests/test_deb822.py
index 34d183d..37fa92b 100755
--- a/tests/test_deb822.py
+++ b/tests/test_deb822.py
@@ -490,7 +490,7 @@ class TestDeb822(unittest.TestCase):
def test_iter_paragraphs_empty_input(self):
generator = deb822.Deb822.iter_paragraphs([])
- self.assertRaises(StopIteration, generator.next)
+ self.assertRaises(StopIteration, next, generator)
def test_parser_limit_fields(self):
wanted_fields = [ 'Package', 'MD5sum', 'Filename', 'Description' ]
@@ -772,10 +772,10 @@ Description: python modules to work with Debian-related data formats
for paragraphs in [deb822.Sources.iter_paragraphs(f1),
deb822.Sources.iter_paragraphs(f2,
use_apt_pkg=False)]:
- p1 = paragraphs.next()
+ p1 = next(paragraphs)
self.assertEqual(p1['maintainer'],
u'Adeodato Simó <dato at net.com.org.es>')
- p2 = paragraphs.next()
+ p2 = next(paragraphs)
self.assertEqual(p2['uploaders'],
u'Frank Küster <frank at debian.org>')
f2.close()
@@ -838,7 +838,7 @@ class TestPkgRelations(unittest.TestCase):
def test_packages(self):
f = open('test_Packages')
pkgs = deb822.Packages.iter_paragraphs(f)
- pkg1 = pkgs.next()
+ pkg1 = next(pkgs)
rel1 = {'breaks': [],
'conflicts': [],
'depends': [[{'name': 'file', 'version': None, 'arch': None}],
@@ -864,7 +864,7 @@ class TestPkgRelations(unittest.TestCase):
[{'name': 't1-cyrillic', 'version': None, 'arch': None}],
[{'name': 'texlive-base-bin', 'version': None, 'arch': None}]]}
self.assertEqual(rel1, pkg1.relations)
- pkg2 = pkgs.next()
+ pkg2 = next(pkgs)
rel2 = {'breaks': [],
'conflicts': [],
'depends': [[{'name': 'lrzsz', 'version': None, 'arch': None}],
@@ -881,7 +881,7 @@ class TestPkgRelations(unittest.TestCase):
'replaces': [],
'suggests': []}
self.assertEqual(rel2, pkg2.relations)
- pkg3 = pkgs.next()
+ pkg3 = next(pkgs)
dep3 = [[{'arch': None, 'name': 'dcoprss', 'version': ('>=', '4:3.5.9-2')}],
[{'arch': None, 'name': 'kdenetwork-kfile-plugins', 'version': ('>=', '4:3.5.9-2')}],
[{'arch': None, 'name': 'kdict', 'version': ('>=', '4:3.5.9-2')}],
@@ -915,7 +915,7 @@ class TestPkgRelations(unittest.TestCase):
def test_sources(self):
f = open('test_Sources')
pkgs = deb822.Sources.iter_paragraphs(f)
- pkg1 = pkgs.next()
+ pkg1 = next(pkgs)
rel1 = {'build-conflicts': [],
'build-conflicts-indep': [],
'build-depends': [[{'name': 'apache2-src', 'version': ('>=', '2.2.9'), 'arch': None}],
@@ -928,7 +928,7 @@ class TestPkgRelations(unittest.TestCase):
'build-depends-indep': [],
'binary': [[{'name': 'apache2-mpm-itk', 'version': None, 'arch': None}]]}
self.assertEqual(rel1, pkg1.relations)
- pkg2 = pkgs.next()
+ pkg2 = next(pkgs)
rel2 = {'build-conflicts': [],
'build-conflicts-indep': [],
'build-depends': [[{'name': 'dpkg-dev', 'version': ('>=', '1.13.9'), 'arch': None}],
--
1.7.2.5
More information about the pkg-python-debian-commits
mailing list