Repository navigation

bpo-36144: Dictionary Union (PEP 584) - #12088

Merged

gvanrossum merged 39 commits into

python:masterfrom

brandtbucher:addiction

Feb 25, 2020

Merged

bpo-36144: Dictionary Union (PEP 584)#12088
gvanrossum merged 39 commits into
python:masterfrom
brandtbucher:addiction

Commits on Feb 28, 2019
- Create dict_add and dict__iadd dict methods.
  brandtbucher
  committed
  9397506
- Fix failing "sum" test.
  brandtbucher
  committed
  c69108a
- Update collections.UserDict.
  brandtbucher
  committed
  dd42f4f
- Update test_dict.py.
  brandtbucher
  committed
  f59cdab
- Update ACKS.
  brandtbucher
  committed
  d895b9b
- Fixed whitespace.
  brandtbucher
  committed
  da8e2e3
- Update doctest count for builtins.
  brandtbucher
  committed
  91d6466
- 📜🤖 Added by blurb_it.
  blurb-it[bot]
  committed
  b2eced1
- Fix error handling.
  brandtbucher
  committed
  bf0b383
Commits on Mar 2, 2019
- Be "nicer" to subclasses than other built-in types.
  brandtbucher
  committed
  e660046
- Add dict subtraction operations.
  brandtbucher
  committed
  4c0223b
- Add new subtraction methods to collections.UserDict.
  brandtbucher
  committed
  2cb1629
- Add new dict subtraction tests.
  brandtbucher
  committed
  05ed4cf
- 📜🤖 Added by blurb_it.
  blurb-it[bot]
  committed
  594ae27
- Merge branch 'addiction' of https://github.com/brandtbucher/cpython into addiction
  brandtbucher
  committed
  d1c830c
Commits on Mar 3, 2019
- Better error handling and "keys" method lookup.
  brandtbucher
  committed
  f7ed0a2
Commits on Mar 6, 2019
- Clean up comments, names, and logic.
  brandtbucher
  committed
  8be454a
Commits on Mar 7, 2019
- Update commented code.
  brandtbucher
  committed
  63c36dd
Commits on Mar 22, 2019
- Update new collections.UserDict operators.
  brandtbucher
  committed
  2ba0580
- Add | and |= operators as aliases to + and +=.
  brandtbucher
  committed
  fa44826
- Fix whitespace... again.
  brandtbucher
  committed
  5d77bf8
Commits on Oct 14, 2019
- Catch up with master.
  brandtbucher
  committed
  1793169
- Remove sub/isub/or/ior operators.
  brandtbucher
  committed
  362657e
Commits on Oct 16, 2019
- Remove extra whitespace.
  brandtbucher
  committed
  04fb96e
- Use copy() instead of __new__() and update(self).
  brandtbucher
  committed
  567a218
- Clarify NEWS entry.
  brandtbucher
  committed
  159ebda
Commits on Dec 28, 2019
- + -> |
  brandtbucher
  committed
  28c5c56
- Update UserDict.
  brandtbucher
  committed
  6951380
- Catch up with master.
  brandtbucher
  committed
  514e1ee
Commits on Feb 5, 2020
- Modernize UserDict.__or__ trio.
  brandtbucher
  committed
  3567247
- Rename test.
  brandtbucher
  committed
  4588b56
- Feedback from code review.
  brandtbucher
  committed
  977ffcd
- Actually call the "copy" and "update" methods of subclasses.
  brandtbucher
  committed
  a26a98e
- Consolidate shared logic.
  brandtbucher
  committed
  dfa7009
Commits on Feb 6, 2020
- Check the return type of self.copy().
  brandtbucher
  committed
  7c40ba6
- Add tests for subclasses.
  brandtbucher
  committed
  b977a27
- Strip whitespace.
  brandtbucher
  committed
  f09ba7a
Commits on Feb 7, 2020
- Remove calls to "update" method when merging.
  brandtbucher
  committed
  ec33664
Commits on Feb 17, 2020
- Revert subclass-preserving stuff.
  brandtbucher
  committed
  4afd3b6

Commits

Commits on Feb 28, 2019

Commits on Mar 2, 2019

Commits on Mar 3, 2019

Commits on Mar 6, 2019

Commits on Mar 7, 2019

Commits on Mar 22, 2019

Commits on Oct 14, 2019

Commits on Oct 16, 2019

Commits on Dec 28, 2019

Commits on Feb 5, 2020

Commits on Feb 6, 2020

Commits on Feb 7, 2020

Commits on Feb 17, 2020