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
94b7d3db
Commit
94b7d3db
authored
Dec 11, 2007
by
Christian Heimes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed #1593 spacing of the builtin_format function is inconsistent. Thanks to Joseph for the fix
parent
a3534a6f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
50 additions
and
50 deletions
+50
-50
Python/bltinmodule.c
Python/bltinmodule.c
+50
-50
No files found.
Python/bltinmodule.c
View file @
94b7d3db
...
...
@@ -284,58 +284,58 @@ If the predicate is None, 'lambda x: bool(x)' is assumed.\n\
static
PyObject
*
builtin_format
(
PyObject
*
self
,
PyObject
*
args
)
{
static
PyObject
*
format_str
=
NULL
;
PyObject
*
value
;
PyObject
*
spec
=
NULL
;
PyObject
*
meth
;
PyObject
*
empty
=
NULL
;
PyObject
*
result
=
NULL
;
/* Initialize cached value */
if
(
format_str
==
NULL
)
{
/* Initialize static variable needed by _PyType_Lookup */
format_str
=
PyUnicode_FromString
(
"__format__"
);
if
(
format_str
==
NULL
)
goto
done
;
}
if
(
!
PyArg_ParseTuple
(
args
,
"O|U:format"
,
&
value
,
&
spec
))
goto
done
;
/* initialize the default value */
if
(
spec
==
NULL
)
{
empty
=
PyUnicode_FromUnicode
(
NULL
,
0
);
spec
=
empty
;
}
/* Make sure the type is initialized. float gets initialized late */
if
(
Py_Type
(
value
)
->
tp_dict
==
NULL
)
if
(
PyType_Ready
(
Py_Type
(
value
))
<
0
)
goto
done
;
/* Find the (unbound!) __format__ method (a borrowed reference) */
meth
=
_PyType_Lookup
(
Py_Type
(
value
),
format_str
);
if
(
meth
==
NULL
)
{
PyErr_Format
(
PyExc_TypeError
,
"Type %.100s doesn't define __format__"
,
Py_Type
(
value
)
->
tp_name
);
goto
done
;
}
/* And call it, binding it to the value */
result
=
PyObject_CallFunctionObjArgs
(
meth
,
value
,
spec
,
NULL
);
if
(
result
&&
!
PyUnicode_Check
(
result
))
{
PyErr_SetString
(
PyExc_TypeError
,
"__format__ method did not return string"
);
Py_DECREF
(
result
);
result
=
NULL
;
goto
done
;
}
static
PyObject
*
format_str
=
NULL
;
PyObject
*
value
;
PyObject
*
spec
=
NULL
;
PyObject
*
meth
;
PyObject
*
empty
=
NULL
;
PyObject
*
result
=
NULL
;
/* Initialize cached value */
if
(
format_str
==
NULL
)
{
/* Initialize static variable needed by _PyType_Lookup */
format_str
=
PyUnicode_FromString
(
"__format__"
);
if
(
format_str
==
NULL
)
goto
done
;
}
if
(
!
PyArg_ParseTuple
(
args
,
"O|U:format"
,
&
value
,
&
spec
))
goto
done
;
/* initialize the default value */
if
(
spec
==
NULL
)
{
empty
=
PyUnicode_FromUnicode
(
NULL
,
0
);
spec
=
empty
;
}
/* Make sure the type is initialized. float gets initialized late */
if
(
Py_Type
(
value
)
->
tp_dict
==
NULL
)
if
(
PyType_Ready
(
Py_Type
(
value
))
<
0
)
goto
done
;
/* Find the (unbound!) __format__ method (a borrowed reference) */
meth
=
_PyType_Lookup
(
Py_Type
(
value
),
format_str
);
if
(
meth
==
NULL
)
{
PyErr_Format
(
PyExc_TypeError
,
"Type %.100s doesn't define __format__"
,
Py_Type
(
value
)
->
tp_name
);
goto
done
;
}
/* And call it, binding it to the value */
result
=
PyObject_CallFunctionObjArgs
(
meth
,
value
,
spec
,
NULL
);
if
(
result
&&
!
PyUnicode_Check
(
result
))
{
PyErr_SetString
(
PyExc_TypeError
,
"__format__ method did not return string"
);
Py_DECREF
(
result
);
result
=
NULL
;
goto
done
;
}
done:
Py_XDECREF
(
empty
);
return
result
;
Py_XDECREF
(
empty
);
return
result
;
}
PyDoc_STRVAR
(
format_doc
,
...
...
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