1.1 --- a/lib/__builtins__/__init__.py Thu Dec 01 17:17:10 2016 +0100
1.2 +++ b/lib/__builtins__/__init__.py Thu Dec 01 17:19:50 2016 +0100
1.3 @@ -76,7 +76,7 @@
1.4 from __builtins__.float import float
1.5 from __builtins__.int import int
1.6 from __builtins__.span import xrange, slice
1.7 -from __builtins__.iterator import listiterator
1.8 +from __builtins__.iterator import itemiterator
1.9 from __builtins__.list import list
1.10 from __builtins__.long import long
1.11 from __builtins__.none import None, NoneType
2.1 --- a/lib/__builtins__/dict.py Thu Dec 01 17:17:10 2016 +0100
2.2 +++ b/lib/__builtins__/dict.py Thu Dec 01 17:19:50 2016 +0100
2.3 @@ -19,7 +19,7 @@
2.4 this program. If not, see <http://www.gnu.org/licenses/>.
2.5 """
2.6
2.7 -from __builtins__.iterator import listiterator
2.8 +from __builtins__.iterator import itemiterator
2.9 import native
2.10
2.11 class dict:
2.12 @@ -148,6 +148,6 @@
2.13
2.14 "Return an iterator."
2.15
2.16 - return listiterator(self.keys())
2.17 + return itemiterator(self.keys())
2.18
2.19 # vim: tabstop=4 expandtab shiftwidth=4
3.1 --- a/lib/__builtins__/iterator.py Thu Dec 01 17:17:10 2016 +0100
3.2 +++ b/lib/__builtins__/iterator.py Thu Dec 01 17:19:50 2016 +0100
3.3 @@ -3,7 +3,7 @@
3.4 """
3.5 Iterator objects.
3.6
3.7 -Copyright (C) 2015 Paul Boddie <paul@boddie.org.uk>
3.8 +Copyright (C) 2015, 2016 Paul Boddie <paul@boddie.org.uk>
3.9
3.10 This program is free software; you can redistribute it and/or modify it under
3.11 the terms of the GNU General Public License as published by the Free Software
3.12 @@ -19,9 +19,9 @@
3.13 this program. If not, see <http://www.gnu.org/licenses/>.
3.14 """
3.15
3.16 -class listiterator(object):
3.17 +class itemiterator(object):
3.18
3.19 - "Implementation of listiterator."
3.20 + "An iterator for objects providing item access."
3.21
3.22 def __init__(self, l):
3.23
4.1 --- a/lib/__builtins__/list.py Thu Dec 01 17:17:10 2016 +0100
4.2 +++ b/lib/__builtins__/list.py Thu Dec 01 17:19:50 2016 +0100
4.3 @@ -19,7 +19,7 @@
4.4 this program. If not, see <http://www.gnu.org/licenses/>.
4.5 """
4.6
4.7 -from __builtins__.iterator import listiterator
4.8 +from __builtins__.iterator import itemiterator
4.9 from __builtins__.sequence import sequence
4.10 import native
4.11
4.12 @@ -98,7 +98,7 @@
4.13
4.14 "Return an iterator."
4.15
4.16 - return listiterator(self)
4.17 + return itemiterator(self)
4.18
4.19 # Special implementation methods.
4.20
5.1 --- a/lib/__builtins__/set.py Thu Dec 01 17:17:10 2016 +0100
5.2 +++ b/lib/__builtins__/set.py Thu Dec 01 17:19:50 2016 +0100
5.3 @@ -3,7 +3,7 @@
5.4 """
5.5 Set objects.
5.6
5.7 -Copyright (C) 2015 Paul Boddie <paul@boddie.org.uk>
5.8 +Copyright (C) 2015, 2016 Paul Boddie <paul@boddie.org.uk>
5.9
5.10 This program is free software; you can redistribute it and/or modify it under
5.11 the terms of the GNU General Public License as published by the Free Software
5.12 @@ -39,7 +39,7 @@
5.13
5.14 "Return an iterator."
5.15
5.16 - return listiterator(list(self))
5.17 + return itemiterator(list(self))
5.18
5.19 def pop(self): pass
5.20 def remove(self, item): pass
6.1 --- a/lib/__builtins__/tuple.py Thu Dec 01 17:17:10 2016 +0100
6.2 +++ b/lib/__builtins__/tuple.py Thu Dec 01 17:19:50 2016 +0100
6.3 @@ -19,7 +19,7 @@
6.4 this program. If not, see <http://www.gnu.org/licenses/>.
6.5 """
6.6
6.7 -from __builtins__.iterator import listiterator
6.8 +from __builtins__.iterator import itemiterator
6.9 from __builtins__.sequence import sequence
6.10 import native
6.11
6.12 @@ -78,7 +78,7 @@
6.13
6.14 "Return an iterator."
6.15
6.16 - return listiterator(self)
6.17 + return itemiterator(self)
6.18
6.19 # Special implementation methods.
6.20