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
f39884bb
Kaydet (Commit)
f39884bb
authored
Eyl 25, 2012
tarafından
Petri Lehtinen
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
#15222: Insert blank line after each message in mbox mailboxes
üst
46809195
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
63 additions
and
6 deletions
+63
-6
mailbox.py
Lib/mailbox.py
+38
-6
test_mailbox.py
Lib/test/test_mailbox.py
+23
-0
NEWS
Misc/NEWS
+2
-0
No files found.
Lib/mailbox.py
Dosyayı görüntüle @
f39884bb
...
@@ -208,6 +208,9 @@ class Mailbox:
...
@@ -208,6 +208,9 @@ class Mailbox:
raise
ValueError
(
"String input must be ASCII-only; "
raise
ValueError
(
"String input must be ASCII-only; "
"use bytes or a Message instead"
)
"use bytes or a Message instead"
)
# Whether each message must end in a newline
_append_newline
=
False
def
_dump_message
(
self
,
message
,
target
,
mangle_from_
=
False
):
def
_dump_message
(
self
,
message
,
target
,
mangle_from_
=
False
):
# This assumes the target file is open in binary mode.
# This assumes the target file is open in binary mode.
"""Dump message contents to target file."""
"""Dump message contents to target file."""
...
@@ -219,6 +222,9 @@ class Mailbox:
...
@@ -219,6 +222,9 @@ class Mailbox:
data
=
buffer
.
read
()
data
=
buffer
.
read
()
data
=
data
.
replace
(
b
'
\n
'
,
linesep
)
data
=
data
.
replace
(
b
'
\n
'
,
linesep
)
target
.
write
(
data
)
target
.
write
(
data
)
if
self
.
_append_newline
and
not
data
.
endswith
(
linesep
):
# Make sure the message ends with a newline
target
.
write
(
linesep
)
elif
isinstance
(
message
,
(
str
,
bytes
,
io
.
StringIO
)):
elif
isinstance
(
message
,
(
str
,
bytes
,
io
.
StringIO
)):
if
isinstance
(
message
,
io
.
StringIO
):
if
isinstance
(
message
,
io
.
StringIO
):
warnings
.
warn
(
"Use of StringIO input is deprecated, "
warnings
.
warn
(
"Use of StringIO input is deprecated, "
...
@@ -230,11 +236,15 @@ class Mailbox:
...
@@ -230,11 +236,15 @@ class Mailbox:
message
=
message
.
replace
(
b
'
\n
From '
,
b
'
\n
>From '
)
message
=
message
.
replace
(
b
'
\n
From '
,
b
'
\n
>From '
)
message
=
message
.
replace
(
b
'
\n
'
,
linesep
)
message
=
message
.
replace
(
b
'
\n
'
,
linesep
)
target
.
write
(
message
)
target
.
write
(
message
)
if
self
.
_append_newline
and
not
message
.
endswith
(
linesep
):
# Make sure the message ends with a newline
target
.
write
(
linesep
)
elif
hasattr
(
message
,
'read'
):
elif
hasattr
(
message
,
'read'
):
if
hasattr
(
message
,
'buffer'
):
if
hasattr
(
message
,
'buffer'
):
warnings
.
warn
(
"Use of text mode files is deprecated, "
warnings
.
warn
(
"Use of text mode files is deprecated, "
"use a binary mode file instead"
,
DeprecationWarning
,
3
)
"use a binary mode file instead"
,
DeprecationWarning
,
3
)
message
=
message
.
buffer
message
=
message
.
buffer
lastline
=
None
while
True
:
while
True
:
line
=
message
.
readline
()
line
=
message
.
readline
()
# Universal newline support.
# Universal newline support.
...
@@ -248,6 +258,10 @@ class Mailbox:
...
@@ -248,6 +258,10 @@ class Mailbox:
line
=
b
'>From '
+
line
[
5
:]
line
=
b
'>From '
+
line
[
5
:]
line
=
line
.
replace
(
b
'
\n
'
,
linesep
)
line
=
line
.
replace
(
b
'
\n
'
,
linesep
)
target
.
write
(
line
)
target
.
write
(
line
)
lastline
=
line
if
self
.
_append_newline
and
lastline
and
not
lastline
.
endswith
(
linesep
):
# Make sure the message ends with a newline
target
.
write
(
linesep
)
else
:
else
:
raise
TypeError
(
'Invalid message type:
%
s'
%
type
(
message
))
raise
TypeError
(
'Invalid message type:
%
s'
%
type
(
message
))
...
@@ -833,30 +847,48 @@ class mbox(_mboxMMDF):
...
@@ -833,30 +847,48 @@ class mbox(_mboxMMDF):
_mangle_from_
=
True
_mangle_from_
=
True
# All messages must end in a newline character, and
# _post_message_hooks outputs an empty line between messages.
_append_newline
=
True
def
__init__
(
self
,
path
,
factory
=
None
,
create
=
True
):
def
__init__
(
self
,
path
,
factory
=
None
,
create
=
True
):
"""Initialize an mbox mailbox."""
"""Initialize an mbox mailbox."""
self
.
_message_factory
=
mboxMessage
self
.
_message_factory
=
mboxMessage
_mboxMMDF
.
__init__
(
self
,
path
,
factory
,
create
)
_mboxMMDF
.
__init__
(
self
,
path
,
factory
,
create
)
def
_pre_message_hook
(
self
,
f
):
def
_post_message_hook
(
self
,
f
):
"""Called before writing each message to file f."""
"""Called after writing each message to file f."""
if
f
.
tell
()
!=
0
:
f
.
write
(
linesep
)
f
.
write
(
linesep
)
def
_generate_toc
(
self
):
def
_generate_toc
(
self
):
"""Generate key-to-(start, stop) table of contents."""
"""Generate key-to-(start, stop) table of contents."""
starts
,
stops
=
[],
[]
starts
,
stops
=
[],
[]
last_was_empty
=
False
self
.
_file
.
seek
(
0
)
self
.
_file
.
seek
(
0
)
while
True
:
while
True
:
line_pos
=
self
.
_file
.
tell
()
line_pos
=
self
.
_file
.
tell
()
line
=
self
.
_file
.
readline
()
line
=
self
.
_file
.
readline
()
if
line
.
startswith
(
b
'From '
):
if
line
.
startswith
(
b
'From '
):
if
len
(
stops
)
<
len
(
starts
):
if
len
(
stops
)
<
len
(
starts
):
stops
.
append
(
line_pos
-
len
(
linesep
))
if
last_was_empty
:
stops
.
append
(
line_pos
-
len
(
linesep
))
else
:
# The last line before the "From " line wasn't
# blank, but we consider it a start of a
# message anyway.
stops
.
append
(
line_pos
)
starts
.
append
(
line_pos
)
starts
.
append
(
line_pos
)
last_was_empty
=
False
elif
not
line
:
elif
not
line
:
stops
.
append
(
line_pos
)
if
last_was_empty
:
stops
.
append
(
line_pos
-
len
(
linesep
))
else
:
stops
.
append
(
line_pos
)
break
break
elif
line
==
linesep
:
last_was_empty
=
True
else
:
last_was_empty
=
False
self
.
_toc
=
dict
(
enumerate
(
zip
(
starts
,
stops
)))
self
.
_toc
=
dict
(
enumerate
(
zip
(
starts
,
stops
)))
self
.
_next_key
=
len
(
self
.
_toc
)
self
.
_next_key
=
len
(
self
.
_toc
)
self
.
_file_length
=
self
.
_file
.
tell
()
self
.
_file_length
=
self
.
_file
.
tell
()
...
...
Lib/test/test_mailbox.py
Dosyayı görüntüle @
f39884bb
...
@@ -1113,6 +1113,29 @@ class TestMbox(_TestMboxMMDF, unittest.TestCase):
...
@@ -1113,6 +1113,29 @@ class TestMbox(_TestMboxMMDF, unittest.TestCase):
perms
=
st
.
st_mode
perms
=
st
.
st_mode
self
.
assertFalse
((
perms
&
0
o111
))
# Execute bits should all be off.
self
.
assertFalse
((
perms
&
0
o111
))
# Execute bits should all be off.
def
test_terminating_newline
(
self
):
message
=
email
.
message
.
Message
()
message
[
'From'
]
=
'john@example.com'
message
.
set_payload
(
'No newline at the end'
)
i
=
self
.
_box
.
add
(
message
)
# A newline should have been appended to the payload
message
=
self
.
_box
.
get
(
i
)
self
.
assertEqual
(
message
.
get_payload
(),
'No newline at the end
\n
'
)
def
test_message_separator
(
self
):
# Check there's always a single blank line after each message
self
.
_box
.
add
(
'From: foo
\n\n
0'
)
# No newline at the end
with
open
(
self
.
_path
)
as
f
:
data
=
f
.
read
()
self
.
assertEqual
(
data
[
-
3
:],
'0
\n\n
'
)
self
.
_box
.
add
(
'From: foo
\n\n
0
\n
'
)
# Newline at the end
with
open
(
self
.
_path
)
as
f
:
data
=
f
.
read
()
self
.
assertEqual
(
data
[
-
3
:],
'0
\n\n
'
)
class
TestMMDF
(
_TestMboxMMDF
,
unittest
.
TestCase
):
class
TestMMDF
(
_TestMboxMMDF
,
unittest
.
TestCase
):
_factory
=
lambda
self
,
path
,
factory
=
None
:
mailbox
.
MMDF
(
path
,
factory
)
_factory
=
lambda
self
,
path
,
factory
=
None
:
mailbox
.
MMDF
(
path
,
factory
)
...
...
Misc/NEWS
Dosyayı görüntüle @
f39884bb
...
@@ -123,6 +123,8 @@ Core and Builtins
...
@@ -123,6 +123,8 @@ Core and Builtins
Library
Library
-------
-------
- Issue #15222: Insert blank line after each message in mbox mailboxes
- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
Patch by Serhiy Storchaka.
Patch by Serhiy Storchaka.
...
...
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