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
f07a4b66
Commit
f07a4b66
authored
Mar 23, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.
parent
1b2f4d5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
Misc/NEWS
Misc/NEWS
+2
-0
Modules/_tkinter.c
Modules/_tkinter.c
+12
-8
No files found.
Misc/NEWS
View file @
f07a4b66
...
...
@@ -23,6 +23,8 @@ Core and Builtins
Library
-------
- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.
- Issue #23647: Increase impalib'
s
MAXLINE
to
accommodate
modern
mailbox
sizes
.
-
Issue
#
23539
:
If
body
is
None
,
http
.
client
.
HTTPConnection
.
request
now
sets
...
...
Modules/_tkinter.c
View file @
f07a4b66
...
...
@@ -229,6 +229,7 @@ typedef struct {
int
dispatching
;
/* We cannot include tclInt.h, as this is internal.
So we cache interesting types here. */
const
Tcl_ObjType
*
OldBooleanType
;
const
Tcl_ObjType
*
BooleanType
;
const
Tcl_ObjType
*
ByteArrayType
;
const
Tcl_ObjType
*
DoubleType
;
...
...
@@ -585,7 +586,8 @@ Tkapp_New(const char *screenName, const char *className,
}
#endif
v
->
BooleanType
=
Tcl_GetObjType
(
"boolean"
);
v
->
OldBooleanType
=
Tcl_GetObjType
(
"boolean"
);
v
->
BooleanType
=
Tcl_GetObjType
(
"booleanString"
);
v
->
ByteArrayType
=
Tcl_GetObjType
(
"bytearray"
);
v
->
DoubleType
=
Tcl_GetObjType
(
"double"
);
v
->
IntType
=
Tcl_GetObjType
(
"int"
);
...
...
@@ -1001,15 +1003,18 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
{
PyObject
*
result
=
NULL
;
TkappObject
*
app
=
(
TkappObject
*
)
tkapp
;
Tcl_Interp
*
interp
=
Tkapp_Interp
(
tkapp
);
if
(
value
->
typePtr
==
NULL
)
{
return
unicodeFromTclStringAndSize
(
value
->
bytes
,
value
->
length
);
}
if
(
value
->
typePtr
==
app
->
BooleanType
)
{
result
=
value
->
internalRep
.
longValue
?
Py_True
:
Py_False
;
Py_INCREF
(
result
);
return
result
;
if
(
value
->
typePtr
==
app
->
BooleanType
||
value
->
typePtr
==
app
->
OldBooleanType
)
{
int
boolValue
;
if
(
Tcl_GetBooleanFromObj
(
interp
,
value
,
&
boolValue
)
==
TCL_ERROR
)
return
Tkinter_Error
(
tkapp
);
return
PyBool_FromLong
(
boolValue
);
}
if
(
value
->
typePtr
==
app
->
ByteArrayType
)
{
...
...
@@ -1032,15 +1037,14 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
PyObject
*
elem
;
Tcl_Obj
*
tcl_elem
;
status
=
Tcl_ListObjLength
(
Tkapp_Interp
(
tkapp
)
,
value
,
&
size
);
status
=
Tcl_ListObjLength
(
interp
,
value
,
&
size
);
if
(
status
==
TCL_ERROR
)
return
Tkinter_Error
(
tkapp
);
result
=
PyTuple_New
(
size
);
if
(
!
result
)
return
NULL
;
for
(
i
=
0
;
i
<
size
;
i
++
)
{
status
=
Tcl_ListObjIndex
(
Tkapp_Interp
(
tkapp
),
value
,
i
,
&
tcl_elem
);
status
=
Tcl_ListObjIndex
(
interp
,
value
,
i
,
&
tcl_elem
);
if
(
status
==
TCL_ERROR
)
{
Py_DECREF
(
result
);
return
Tkinter_Error
(
tkapp
);
...
...
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