diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-02-19 23:06:24 -0500 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-02-19 23:06:24 -0500 |
commit | a157be6134b7eadad74807c4dad4a3e4fdf859ae (patch) | |
tree | 18f1087f691b1e3bcfd4e6f4653b749a6d3c20a2 /Objects/typeslots.py | |
parent | 54ac498cb5ae908075136ee25cb9d4334577ac29 (diff) | |
parent | 28e6408e80bee8e06a12648342a84517260aee86 (diff) | |
download | cpython-a157be6134b7eadad74807c4dad4a3e4fdf859ae.tar.gz |
merge 3.2 (#20695)
Diffstat (limited to 'Objects/typeslots.py')
-rwxr-xr-x[-rw-r--r--] | Objects/typeslots.py | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/Objects/typeslots.py b/Objects/typeslots.py index b24c7f4040..b24c7f4040 100644..100755 --- a/Objects/typeslots.py +++ b/Objects/typeslots.py |