split local and stdlib module imports (eases migration issues)

mercurial/commands.py

@@ -8,9 +8,9 b''
 from node import hex, nullid, nullrev, short
 from lock import release
 from i18n import _, gettext
-import os, re, sys, subprocess, difflib, time
+import os, re, sys, subprocess, difflib, time, tempfile
 import hg, util, revlog, bundlerepo, extensions, copies, context, error
-import patch, help, mdiff, tempfile, url, encoding
+import patch, help, mdiff, url, encoding
 import archival, changegroup, cmdutil, sshserver, hbisect
 from hgweb import server
 import merge as merge_

mercurial/match.py

@@ -5,7 +5,8 b''
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
-import util, re
+import re
+import util
 
 class match(object):
     def __init__(self, root, cwd, patterns, include=[], exclude=[],