Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5998a25
Merge remote-tracking branch 'upstream/master'
ericvsmith Jan 24, 2018
900f699
Merge branch 'master' of github.com:ericvsmith/cpython
ericvsmith Jan 24, 2018
1609d08
Merge branch 'master' of github.com:python/cpython
ericvsmith Jan 25, 2018
8ae6c47
Merge branch 'master' of github.com:python/cpython
ericvsmith Jan 28, 2018
e0156c8
Merge branch 'master' of github.com:python/cpython
ericvsmith Jan 28, 2018
dd9be0d
Merge branch 'master' of github.com:python/cpython
ericvsmith Jan 28, 2018
ef7a3b5
Merge branch 'master' of github.com:python/cpython
ericvsmith Jan 28, 2018
356ca29
Merge branch 'master' of github.com:python/cpython
ericvsmith Feb 2, 2018
5f4a3cc
Merge branch 'master' of github.com:python/cpython
ericvsmith Feb 10, 2018
d8ef404
Merge remote-tracking branch 'refs/remotes/origin/master'
ericvsmith Feb 12, 2018
dda3dbf
Merge branch 'master' of github.com:ericvsmith/cpython
ericvsmith Feb 13, 2018
4916fff
Merge branch 'master' of github.com:python/cpython
ericvsmith Feb 23, 2018
9f907d2
Merge branch 'master' of github.com:python/cpython
ericvsmith Feb 26, 2018
50a9092
Merge branch 'master' of github.com:python/cpython
ericvsmith Feb 26, 2018
6513c67
Merge branch 'master' of github.com:ericvsmith/cpython
ericvsmith Feb 27, 2018
6d68061
Work in progress: Change _MARKER to _FIELDS, change how __setattr__ a…
ericvsmith Mar 15, 2018
e6abc35
Merge branch 'master' of github.com:python/cpython into bpo-32953-dat…
ericvsmith Mar 17, 2018
6b2a685
Merge branch 'master' into bpo-32953-dataclasses-inherit-frozen
ericvsmith Mar 17, 2018
71958ae
Start adding __dataclass_params__.
ericvsmith Mar 17, 2018
a2e9cbe
Merge branch 'master' of github.com:python/cpython
ericvsmith Mar 17, 2018
5c173f8
Merge branch 'master' into bpo-32953-dataclasses-inherit-frozen
ericvsmith Mar 17, 2018
a114520
Fix unsafe_hash default.
ericvsmith Mar 17, 2018
5122e2d
Handle case where the most base class is a dataclass.
ericvsmith Mar 18, 2018
d763785
Add blurb.
ericvsmith Mar 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:python/cpython
  • Loading branch information
ericvsmith committed Jan 28, 2018
commit dd9be0de9213b548fb7ae5bddb2d8b3bbcdccb7a

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.