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
c20c97f6
Kaydet (Commit)
c20c97f6
authored
Şub 26, 2018
tarafından
bennorth
Kaydeden (comit)
Serhiy Storchaka
Şub 26, 2018
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
bpo-18533: Avoid RuntimeError from repr() of recursive dictview (#4823) (#5357)
(cherry picked from commit
d7773d92
)
üst
ecaa372f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
7 deletions
+46
-7
test_dictviews.py
Lib/test/test_dictviews.py
+15
-0
test_ordered_dict.py
Lib/test/test_ordered_dict.py
+13
-0
2017-12-13-16-46-23.bpo-18533.Dlk8d7.rst
...ore and Builtins/2017-12-13-16-46-23.bpo-18533.Dlk8d7.rst
+3
-0
dictobject.c
Objects/dictobject.c
+15
-7
No files found.
Lib/test/test_dictviews.py
Dosyayı görüntüle @
c20c97f6
import
copy
import
pickle
import
sys
import
unittest
import
collections
from
test
import
test_support
...
...
@@ -169,6 +170,20 @@ class DictSetTest(unittest.TestCase):
def
test_recursive_repr
(
self
):
d
=
{}
d
[
42
]
=
d
.
viewvalues
()
r
=
repr
(
d
)
# Cannot perform a stronger test, as the contents of the repr
# are implementation-dependent. All we can say is that we
# want a str result, not an exception of any sort.
self
.
assertIsInstance
(
r
,
str
)
d
[
42
]
=
d
.
viewitems
()
r
=
repr
(
d
)
# Again.
self
.
assertIsInstance
(
r
,
str
)
def
test_deeply_nested_repr
(
self
):
d
=
{}
for
i
in
range
(
sys
.
getrecursionlimit
()
+
100
):
d
=
{
42
:
d
.
viewvalues
()}
self
.
assertRaises
(
RuntimeError
,
repr
,
d
)
def
test_abc_registry
(
self
):
...
...
Lib/test/test_ordered_dict.py
Dosyayı görüntüle @
c20c97f6
...
...
@@ -220,6 +220,19 @@ class TestOrderedDict(unittest.TestCase):
self
.
assertEqual
(
repr
(
od
),
"OrderedDict([('a', None), ('b', None), ('c', None), ('x', ...)])"
)
def
test_repr_recursive_values
(
self
):
od
=
OrderedDict
()
od
[
42
]
=
od
.
viewvalues
()
r
=
repr
(
od
)
# Cannot perform a stronger test, as the contents of the repr
# are implementation-dependent. All we can say is that we
# want a str result, not an exception of any sort.
self
.
assertIsInstance
(
r
,
str
)
od
[
42
]
=
od
.
viewitems
()
r
=
repr
(
od
)
# Again.
self
.
assertIsInstance
(
r
,
str
)
def
test_setdefault
(
self
):
pairs
=
[(
'c'
,
1
),
(
'b'
,
2
),
(
'a'
,
3
),
(
'd'
,
4
),
(
'e'
,
5
),
(
'f'
,
6
)]
shuffle
(
pairs
)
...
...
Misc/NEWS.d/next/Core and Builtins/2017-12-13-16-46-23.bpo-18533.Dlk8d7.rst
0 → 100644
Dosyayı görüntüle @
c20c97f6
``repr()`` on a dict containing its own ``viewvalues()`` or
``viewitems()`` no longer raises ``RuntimeError``. Instead, use
``...``, as for other recursive structures. Patch by Ben North.
Objects/dictobject.c
Dosyayı görüntüle @
c20c97f6
...
...
@@ -3005,21 +3005,29 @@ dictview_repr(dictviewobject *dv)
{
PyObject
*
seq
;
PyObject
*
seq_str
;
PyObject
*
result
;
PyObject
*
result
=
NULL
;
Py_ssize_t
rc
;
rc
=
Py_ReprEnter
((
PyObject
*
)
dv
);
if
(
rc
!=
0
)
{
return
rc
>
0
?
PyString_FromString
(
"..."
)
:
NULL
;
}
seq
=
PySequence_List
((
PyObject
*
)
dv
);
if
(
seq
==
NULL
)
return
NULL
;
if
(
seq
==
NULL
)
{
goto
Done
;
}
seq_str
=
PyObject_Repr
(
seq
);
Py_DECREF
(
seq
);
if
(
seq_str
==
NULL
)
{
Py_DECREF
(
seq
);
return
NULL
;
goto
Done
;
}
result
=
PyString_FromFormat
(
"%s(%s)"
,
Py_TYPE
(
dv
)
->
tp_name
,
PyString_AS_STRING
(
seq_str
));
Py_DECREF
(
seq_str
);
Py_DECREF
(
seq
);
Done:
Py_ReprLeave
((
PyObject
*
)
dv
);
return
result
;
}
...
...
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