← Back to branch summary

~pythonregexp2.7/python/issue2636-22

« back to all changes in this revision

Viewing changes to Lib/_abcoll.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-06-09 14:36:32 UTC
  • mfrom: (39021.1.402 Regexp-2.6)
  • Revision ID: darklord@timehorse.com-20080609143632-wwwkx92u1t5l7yd3
Merged in changes from the latest python source snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/_abcoll.py
329
329
        else:
330
330
            return True
331
331
 
 
332
    def iterkeys(self):
 
333
        return iter(self)
 
334
 
 
335
    def itervalues(self):
 
336
        for key in self:
 
337
            yield self[key]
 
338
 
 
339
    def iteritems(self):
 
340
        for key in self:
 
341
            yield (key, self[key])
 
342
 
332
343
    def keys(self):
333
 
        return KeysView(self)
 
344
        return list(self)
334
345
 
335
346
    def items(self):
336
 
        return ItemsView(self)
 
347
        return [(key, self[key]) for key in self]
337
348
 
338
349
    def values(self):
339
 
        return ValuesView(self)
 
350
        return [self[key] for key in self]
340
351
 
341
352
    def __eq__(self, other):
342
353
        return isinstance(other, Mapping) and \
363
374
        for key in self._mapping:
364
375
            yield key
365
376
 
366
 
KeysView.register(type({}.keys()))
367
 
 
368
377
 
369
378
class ItemsView(MappingView, Set):
370
379
 
381
390
        for key in self._mapping:
382
391
            yield (key, self._mapping[key])
383
392
 
384
 
ItemsView.register(type({}.items()))
385
 
 
386
393
 
387
394
class ValuesView(MappingView):
388
395
 
396
403
        for key in self._mapping:
397
404
            yield self._mapping[key]
398
405
 
399
 
ValuesView.register(type({}.values()))
400
 
 
401
406
 
402
407
class MutableMapping(Mapping):
403
408