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
b643ef8f
Kaydet (Commit)
b643ef8f
authored
Eki 31, 2010
tarafından
Raymond Hettinger
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Issue #5729: json.dumps to support using '\t' as an indent string
üst
6ff2a7d1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
26 deletions
+38
-26
json.rst
Doc/library/json.rst
+6
-4
encoder.py
Lib/json/encoder.py
+7
-4
test_indent.py
Lib/json/tests/test_indent.py
+22
-18
NEWS
Misc/NEWS
+3
-0
No files found.
Doc/library/json.rst
Dosyayı görüntüle @
b643ef8f
...
...
@@ -135,10 +135,12 @@ Basic Usage
``inf``, ``-inf``) in strict compliance of the JSON specification, instead of
using the JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).
If *indent* is a non-negative integer, then JSON array elements and object
members will be pretty-printed with that indent level. An indent level of 0
will only insert newlines. ``None`` (the default) selects the most compact
representation.
If *indent* is a non-negative integer or string, then JSON array elements and
object members will be pretty-printed with that indent level. An indent level
of 0 or ``""`` will only insert newlines. ``None`` (the default) selects the
most compact representation. Using an integer indent indents that many spaces
per level. If *indent* is a string (such at '\t'), that string is used to indent
each level.
If *separators* is an ``(item_separator, dict_separator)`` tuple, then it
will be used instead of the default ``(', ', ': ')`` separators. ``(',',
...
...
Lib/json/encoder.py
Dosyayı görüntüle @
b643ef8f
...
...
@@ -259,6 +259,9 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
tuple
=
tuple
,
):
if
_indent
is
not
None
and
not
isinstance
(
_indent
,
str
):
_indent
=
' '
*
_indent
def
_iterencode_list
(
lst
,
_current_indent_level
):
if
not
lst
:
yield
'[]'
...
...
@@ -271,7 +274,7 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
buf
=
'['
if
_indent
is
not
None
:
_current_indent_level
+=
1
newline_indent
=
'
\n
'
+
(
' '
*
(
_indent
*
_current_indent_level
))
newline_indent
=
'
\n
'
+
_indent
*
_current_indent_level
separator
=
_item_separator
+
newline_indent
buf
+=
newline_indent
else
:
...
...
@@ -307,7 +310,7 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
yield
chunk
if
newline_indent
is
not
None
:
_current_indent_level
-=
1
yield
'
\n
'
+
(
' '
*
(
_indent
*
_current_indent_level
))
yield
'
\n
'
+
_indent
*
_current_indent_level
yield
']'
if
markers
is
not
None
:
del
markers
[
markerid
]
...
...
@@ -324,7 +327,7 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
yield
'{'
if
_indent
is
not
None
:
_current_indent_level
+=
1
newline_indent
=
'
\n
'
+
(
' '
*
(
_indent
*
_current_indent_level
))
newline_indent
=
'
\n
'
+
_indent
*
_current_indent_level
item_separator
=
_item_separator
+
newline_indent
yield
newline_indent
else
:
...
...
@@ -383,7 +386,7 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
yield
chunk
if
newline_indent
is
not
None
:
_current_indent_level
-=
1
yield
'
\n
'
+
(
' '
*
(
_indent
*
_current_indent_level
))
yield
'
\n
'
+
_indent
*
_current_indent_level
yield
'}'
if
markers
is
not
None
:
del
markers
[
markerid
]
...
...
Lib/json/tests/test_indent.py
Dosyayı görüntüle @
b643ef8f
...
...
@@ -10,32 +10,36 @@ class TestIndent(TestCase):
expect
=
textwrap
.
dedent
(
"""
\
[
[
"blorpie"
],
[
"whoops"
],
[],
"d-shtaeou",
"d-nthiouh",
"i-vhbjkhnth",
{
"nifty": 87
},
{
"field": "yes",
"morefield": false
}
\t
[
\t\t
"blorpie"
\t
],
\t
[
\t\t
"whoops"
\t
],
\t
[],
\t
"d-shtaeou",
\t
"d-nthiouh",
\t
"i-vhbjkhnth",
\t
{
\t\t
"nifty": 87
\t
},
\t
{
\t\t
"field": "yes",
\t\t
"morefield": false
\t
}
]"""
)
d1
=
json
.
dumps
(
h
)
d2
=
json
.
dumps
(
h
,
indent
=
2
,
sort_keys
=
True
,
separators
=
(
','
,
': '
))
d3
=
json
.
dumps
(
h
,
indent
=
'
\t
'
,
sort_keys
=
True
,
separators
=
(
','
,
': '
))
h1
=
json
.
loads
(
d1
)
h2
=
json
.
loads
(
d2
)
h3
=
json
.
loads
(
d3
)
self
.
assertEquals
(
h1
,
h
)
self
.
assertEquals
(
h2
,
h
)
self
.
assertEquals
(
d2
,
expect
)
self
.
assertEquals
(
h3
,
h
)
self
.
assertEquals
(
d2
,
expect
.
expandtabs
(
2
))
self
.
assertEquals
(
d3
,
expect
)
Misc/NEWS
Dosyayı görüntüle @
b643ef8f
...
...
@@ -59,6 +59,9 @@ Core and Builtins
Library
-------
- Issue #5729: json.dumps() now supports using a string such as '\t'
for pretty-printing multilevel objects.
- Issue #10253: FileIO leaks a file descriptor when trying to open a file
for append that isn't seekable. Patch by Brian Brazil.
...
...
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