Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
cpython
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
cpython
Commits
f7de3dd0
Kaydet (Commit)
f7de3dd0
authored
Nis 02, 2015
tarafından
Serhiy Storchaka
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.
üst
f41f8f99
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
15 deletions
+51
-15
test_tcl.py
Lib/test/test_tcl.py
+15
-0
NEWS
Misc/NEWS
+2
-0
_tkinter.c
Modules/_tkinter.c
+34
-15
No files found.
Lib/test/test_tcl.py
Dosyayı görüntüle @
f7de3dd0
...
...
@@ -378,6 +378,21 @@ class TclTest(unittest.TestCase):
if
tcl_version
>=
(
8
,
5
):
check
(
'2**64'
,
True
)
def
test_booleans
(
self
):
tcl
=
self
.
interp
def
check
(
expr
,
expected
):
result
=
tcl
.
call
(
'expr'
,
expr
)
self
.
assertEqual
(
result
,
expected
)
self
.
assertIsInstance
(
result
,
int
)
check
(
'true'
,
True
)
check
(
'yes'
,
True
)
check
(
'on'
,
True
)
check
(
'false'
,
False
)
check
(
'no'
,
False
)
check
(
'off'
,
False
)
check
(
'1 < 2'
,
True
)
check
(
'1 > 2'
,
False
)
def
test_passing_values
(
self
):
def
passValue
(
value
):
return
self
.
interp
.
call
(
'set'
,
'_'
,
value
)
...
...
Misc/NEWS
Dosyayı görüntüle @
f7de3dd0
...
...
@@ -24,6 +24,8 @@ Core and Builtins
Library
-------
- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.
- Issue #23838: linecache now clears the cache and returns an empty result on
MemoryError.
...
...
Modules/_tkinter.c
Dosyayı görüntüle @
f7de3dd0
...
...
@@ -242,13 +242,14 @@ typedef struct {
int
dispatching
;
/* We cannot include tclInt.h, as this is internal.
So we cache interesting types here. */
Tcl_ObjType
*
BooleanType
;
Tcl_ObjType
*
ByteArrayType
;
Tcl_ObjType
*
DoubleType
;
Tcl_ObjType
*
IntType
;
Tcl_ObjType
*
ListType
;
Tcl_ObjType
*
ProcBodyType
;
Tcl_ObjType
*
StringType
;
const
Tcl_ObjType
*
OldBooleanType
;
const
Tcl_ObjType
*
BooleanType
;
const
Tcl_ObjType
*
ByteArrayType
;
const
Tcl_ObjType
*
DoubleType
;
const
Tcl_ObjType
*
IntType
;
const
Tcl_ObjType
*
ListType
;
const
Tcl_ObjType
*
ProcBodyType
;
const
Tcl_ObjType
*
StringType
;
}
TkappObject
;
#define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
...
...
@@ -577,7 +578,8 @@ Tkapp_New(char *screenName, 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"
);
...
...
@@ -979,20 +981,29 @@ AsObj(PyObject *value)
}
}
static
PyObject
*
fromBoolean
(
PyObject
*
tkapp
,
Tcl_Obj
*
value
)
{
int
boolValue
;
if
(
Tcl_GetBooleanFromObj
(
Tkapp_Interp
(
tkapp
),
value
,
&
boolValue
)
==
TCL_ERROR
)
return
Tkinter_Error
(
tkapp
);
return
PyBool_FromLong
(
boolValue
);
}
static
PyObject
*
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
)
{
return
fromBoolean
(
tkapp
,
value
);
}
if
(
value
->
typePtr
==
app
->
ByteArrayType
)
{
...
...
@@ -1015,15 +1026,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
);
...
...
@@ -1048,6 +1058,15 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
Tcl_GetCharLength
(
value
));
}
#if TK_VERSION_HEX >= 0x08050000
if
(
app
->
BooleanType
==
NULL
&&
strcmp
(
value
->
typePtr
->
name
,
"booleanString"
)
==
0
)
{
/* booleanString type is not registered in Tcl */
app
->
BooleanType
=
value
->
typePtr
;
return
fromBoolean
(
tkapp
,
value
);
}
#endif
return
newPyTclObject
(
value
);
}
...
...
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