From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 6 May 2016 21:35:21 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=234480df1c43539cc9e00518cde009f8a8db78df;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

234480df1c43539cc9e00518cde009f8a8db78df
diff --cc Lib/test/test_email/test_asian_codecs.py
index 42bb3e9ee3bf,f9cd7d9b4ec1..1e0caeeaed08
--- a/Lib/test/test_email/test_asian_codecs.py
+++ b/Lib/test/test_email/test_asian_codecs.py
@@@ -3,8 -3,9 +3,8 @@@
  # email package unit tests for (optional) Asian codecs
  
  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