01-from-upstream.patch 904 B

12345678910111213141516171819202122232425262728293031
  1. --- contrib/python/cycler/py2/cycler.py (index)
  2. +++ contrib/python/cycler/py2/cycler.py (working tree)
  3. @@ -87,7 +87,7 @@ class Cycler(object):
  4. in-place ``+``
  5. ``*``
  6. - for outer products (itertools.product) and integer multiplication
  7. + for outer products (`itertools.product`) and integer multiplication
  8. ``*=``
  9. in-place ``*``
  10. @@ -135,6 +135,9 @@ class Cycler(object):
  11. self._keys = _process_keys(self._left, self._right)
  12. self._op = op
  13. + def __contains__(self, k):
  14. + return k in self._keys
  15. +
  16. @property
  17. def keys(self):
  18. """
  19. @@ -367,8 +370,7 @@ class Cycler(object):
  20. # and if we care.
  21. keys = self.keys
  22. - # change this to dict comprehension when drop 2.6
  23. - out = dict((k, list()) for k in keys)
  24. + out = {k: list() for k in keys}
  25. for d in self:
  26. for k in keys: