diff -r f962870712da -r 1e5b38a919dd mercurial/fancyopts.py
--- a/mercurial/fancyopts.py	Wed Nov 06 18:19:04 2013 -0500
+++ b/mercurial/fancyopts.py	Wed Nov 06 16:48:06 2013 -0500
@@ -5,7 +5,8 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-import getopt, util
+import getopt
+import util
 from i18n import _
 
 def gnugetopt(args, options, longoptions):