tests/test-import.t

--- a/tests/test-import.t	Thu Oct 18 21:55:47 2018 -0400
+++ b/tests/test-import.t	Wed Oct 17 23:33:43 2018 -0400
@@ -285,7 +285,8 @@
   $ rm -r b
 
   $ cat > mkmsg.py <<EOF
-  > import email.message, sys
+  > import email.message
+  > import sys
   > msg = email.message.Message()
   > patch = open(sys.argv[1], 'rb').read()
   > msg.set_payload(b'email commit message\n' + patch)
@@ -383,7 +384,8 @@
 The '---' tests the gitsendmail handling without proper mail headers
 
   $ cat > mkmsg2.py <<EOF
-  > import email.message, sys
+  > import email.message
+  > import sys
   > msg = email.message.Message()
   > patch = open(sys.argv[1], 'rb').read()
   > msg.set_payload(b'email patch\n\nnext line\n---\n' + patch)
@@ -1871,8 +1873,8 @@
 ===========================
 
   $ cat > $TESTTMP/parseextra.py <<EOF
+  > import mercurial.cmdutil
   > import mercurial.patch
-  > import mercurial.cmdutil
   > 
   > def processfoo(repo, data, extra, opts):
   >     if b'foo' in data: