--- a/mercurial/pycompat.py Fri Sep 30 00:27:35 2016 +0200
+++ b/mercurial/pycompat.py Wed Sep 28 20:01:23 2016 +0900
@@ -12,7 +12,9 @@
import sys
-if sys.version_info[0] < 3:
+ispy3 = (sys.version_info[0] >= 3)
+
+if not ispy3:
import cPickle as pickle
import cStringIO as io
import httplib
@@ -29,7 +31,7 @@
import urllib.parse as urlparse
import xmlrpc.client as xmlrpclib
-if sys.version_info[0] >= 3:
+if ispy3:
import builtins
import functools
@@ -72,7 +74,7 @@
httpserver = _pycompatstub()
urlreq = _pycompatstub()
urlerr = _pycompatstub()
-if sys.version_info[0] < 3:
+if not ispy3:
import BaseHTTPServer
import CGIHTTPServer
import SimpleHTTPServer