Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
6fcf9b50
Commit
6fcf9b50
authored
Sep 01, 2009
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove the check that classmethod's argument is a callable
parent
8514b85e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
17 deletions
+5
-17
Lib/test/test_descr.py
Lib/test/test_descr.py
+3
-7
Misc/NEWS
Misc/NEWS
+2
-0
Objects/classobject.c
Objects/classobject.c
+0
-4
Objects/funcobject.c
Objects/funcobject.c
+0
-6
No files found.
Lib/test/test_descr.py
View file @
6fcf9b50
...
...
@@ -1391,13 +1391,9 @@ order (MRO) for bases """
self
.
assertEqual
(
super
(
D
,
D
).
goo
(),
(
D
,))
self
.
assertEqual
(
super
(
D
,
d
).
goo
(),
(
D
,))
# Verify that argument is checked for callability (SF bug 753451)
try
:
classmethod
(
1
).
__get__
(
1
)
except
TypeError
:
pass
else
:
self
.
fail
(
"classmethod should check for callability"
)
# Verify that a non-callable will raise
meth
=
classmethod
(
1
).
__get__
(
1
)
self
.
assertRaises
(
TypeError
,
meth
)
# Verify that classmethod() doesn't allow keyword args
try
:
...
...
Misc/NEWS
View file @
6fcf9b50
...
...
@@ -12,6 +12,8 @@ What's New in Python 2.7 alpha 1
Core and Builtins
-----------------
- classmethod no longer checks if its argument is callable.
- Issue #6750: A text file opened with io.open() could duplicate its output
when writing from multiple threads at the same time.
...
...
Objects/classobject.c
View file @
6fcf9b50
...
...
@@ -2226,10 +2226,6 @@ PyObject *
PyMethod_New
(
PyObject
*
func
,
PyObject
*
self
,
PyObject
*
klass
)
{
register
PyMethodObject
*
im
;
if
(
!
PyCallable_Check
(
func
))
{
PyErr_BadInternalCall
();
return
NULL
;
}
im
=
free_list
;
if
(
im
!=
NULL
)
{
free_list
=
(
PyMethodObject
*
)(
im
->
im_self
);
...
...
Objects/funcobject.c
View file @
6fcf9b50
...
...
@@ -659,12 +659,6 @@ cm_init(PyObject *self, PyObject *args, PyObject *kwds)
return
-
1
;
if
(
!
_PyArg_NoKeywords
(
"classmethod"
,
kwds
))
return
-
1
;
if
(
!
PyCallable_Check
(
callable
))
{
PyErr_Format
(
PyExc_TypeError
,
"'%s' object is not callable"
,
callable
->
ob_type
->
tp_name
);
return
-
1
;
}
Py_INCREF
(
callable
);
cm
->
cm_callable
=
callable
;
return
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment