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
8635dea2
Commit
8635dea2
authored
Oct 20, 1997
by
Guido van Rossum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Write a str() function for class objects that returns
"modulename.classname" instead of returning the same as repr().
parent
3000f984
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
2 deletions
+36
-2
Objects/classobject.c
Objects/classobject.c
+36
-2
No files found.
Objects/classobject.c
View file @
8635dea2
...
@@ -261,16 +261,50 @@ static PyObject *
...
@@ -261,16 +261,50 @@ static PyObject *
class_repr
(
op
)
class_repr
(
op
)
PyClassObject
*
op
;
PyClassObject
*
op
;
{
{
PyObject
*
mod
=
PyDict_GetItemString
(
op
->
cl_dict
,
"__module__"
);
char
buf
[
140
];
char
buf
[
140
];
char
*
name
;
char
*
name
;
if
(
op
->
cl_name
==
NULL
||
!
PyString_Check
(
op
->
cl_name
))
if
(
op
->
cl_name
==
NULL
||
!
PyString_Check
(
op
->
cl_name
))
name
=
"?"
;
name
=
"?"
;
else
else
name
=
PyString_AsString
(
op
->
cl_name
);
name
=
PyString_AsString
(
op
->
cl_name
);
sprintf
(
buf
,
"<class %.100s at %lx>"
,
name
,
(
long
)
op
);
if
(
mod
==
NULL
||
!
PyString_Check
(
mod
))
sprintf
(
buf
,
"<class ?.%.100s at %lx>"
,
name
,
(
long
)
op
);
else
sprintf
(
buf
,
"<class %.50s.%.50s at %lx>"
,
PyString_AsString
(
mod
),
name
,
(
long
)
op
);
return
PyString_FromString
(
buf
);
return
PyString_FromString
(
buf
);
}
}
static
PyObject
*
class_str
(
op
)
PyClassObject
*
op
;
{
PyObject
*
mod
=
PyDict_GetItemString
(
op
->
cl_dict
,
"__module__"
);
PyObject
*
name
=
op
->
cl_name
;
PyObject
*
res
;
int
m
,
n
;
if
(
name
==
NULL
||
!
PyString_Check
(
name
))
return
class_repr
(
op
);
if
(
mod
==
NULL
||
!
PyString_Check
(
mod
))
{
Py_INCREF
(
name
);
return
name
;
}
m
=
PyString_Size
(
mod
);
n
=
PyString_Size
(
name
);
res
=
PyString_FromStringAndSize
((
char
*
)
NULL
,
m
+
1
+
n
);
if
(
res
!=
NULL
)
{
char
*
s
=
PyString_AsString
(
res
);
memcpy
(
s
,
PyString_AsString
(
mod
),
m
);
s
+=
m
;
*
s
++
=
'.'
;
memcpy
(
s
,
PyString_AsString
(
name
),
n
);
}
return
res
;
}
PyTypeObject
PyClass_Type
=
{
PyTypeObject
PyClass_Type
=
{
PyObject_HEAD_INIT
(
&
PyType_Type
)
PyObject_HEAD_INIT
(
&
PyType_Type
)
0
,
0
,
...
@@ -288,7 +322,7 @@ PyTypeObject PyClass_Type = {
...
@@ -288,7 +322,7 @@ PyTypeObject PyClass_Type = {
0
,
/*tp_as_mapping*/
0
,
/*tp_as_mapping*/
0
,
/*tp_hash*/
0
,
/*tp_hash*/
0
,
/*tp_call*/
0
,
/*tp_call*/
0
,
/*tp_str*/
(
reprfunc
)
class_str
,
/*tp_str*/
(
getattrofunc
)
class_getattr
,
/*tp_getattro*/
(
getattrofunc
)
class_getattr
,
/*tp_getattro*/
(
setattrofunc
)
class_setattr
,
/*tp_setattro*/
(
setattrofunc
)
class_setattr
,
/*tp_setattro*/
};
};
...
...
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