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
f73a48cb
Commit
f73a48cb
authored
May 06, 2016
by
Terry Jan Reedy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue 26912: fix broken imports in test_email package.
parent
823c626b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
12 deletions
+9
-12
Lib/test/test_email/test_asian_codecs.py
Lib/test/test_email/test_asian_codecs.py
+3
-3
Lib/test/test_email/torture_test.py
Lib/test/test_email/torture_test.py
+6
-9
No files found.
Lib/test/test_email/test_asian_codecs.py
View file @
f73a48cb
...
...
@@ -5,7 +5,7 @@
import
unittest
from
test.support
import
run_unittest
from
test.test_email
.test_email
import
TestEmailBase
from
test.test_email
import
TestEmailBase
from
email.charset
import
Charset
from
email.header
import
Header
,
decode_header
from
email.message
import
Message
...
...
@@ -18,7 +18,7 @@ except LookupError:
raise
unittest
.
SkipTest
class
TestEmailAsianCodecs
(
TestEmailBase
):
def
test_japanese_codecs
(
self
):
eq
=
self
.
ndiffAssertEqual
...
...
@@ -77,6 +77,6 @@ Hello World! =?iso-2022-jp?b?GyRCJU8lbSE8JW8hPCVrJUkhKhsoQg==?=
self
.
assertEqual
(
jhello
,
ustr
)
if
__name__
==
'__main__'
:
unittest
.
main
()
Lib/test/test_email/torture_test.py
View file @
f73a48cb
...
...
@@ -10,10 +10,9 @@ import sys
import
os
import
unittest
from
io
import
StringIO
from
types
import
ListType
from
email.
test.test_email
import
TestEmailBase
from
test.support
import
TestSkipped
,
run_unittest
from
test.test_email
import
TestEmailBase
from
test.support
import
run_unittest
import
email
from
email
import
__file__
as
testfile
...
...
@@ -28,10 +27,10 @@ def openfile(filename):
try
:
openfile
(
'crispin-torture.txt'
)
except
OSError
:
raise
TestSkipped
raise
unittest
.
SkipTest
class
TortureBase
(
TestEmailBase
):
def
_msgobj
(
self
,
filename
):
fp
=
openfile
(
filename
)
...
...
@@ -42,7 +41,7 @@ class TortureBase(TestEmailBase):
return
msg
class
TestCrispinTorture
(
TortureBase
):
# Mark Crispin's torture test from the SquirrelMail project
def
test_mondo_message
(
self
):
...
...
@@ -50,7 +49,7 @@ class TestCrispinTorture(TortureBase):
neq
=
self
.
ndiffAssertEqual
msg
=
self
.
_msgobj
(
'crispin-torture.txt'
)
payload
=
msg
.
get_payload
()
eq
(
type
(
payload
),
ListType
)
eq
(
type
(
payload
),
list
)
eq
(
len
(
payload
),
12
)
eq
(
msg
.
preamble
,
None
)
eq
(
msg
.
epilogue
,
'
\
n
'
)
...
...
@@ -113,7 +112,6 @@ multipart/mixed
audio/x-sun
"""
)
def
_testclasses
():
mod
=
sys
.
modules
[
__name__
]
return
[
getattr
(
mod
,
name
)
for
name
in
dir
(
mod
)
if
name
.
startswith
(
'Test'
)]
...
...
@@ -131,6 +129,5 @@ def test_main():
run_unittest
(
testclass
)
if
__name__
==
'__main__'
:
unittest
.
main
(
defaultTest
=
'suite'
)
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