--- a/mercurial/pure/mpatch.py Sat Dec 12 13:35:41 2015 -0500
+++ b/mercurial/pure/mpatch.py Sat Dec 12 13:37:56 2015 -0500
@@ -5,11 +5,12 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
+from __future__ import absolute_import
+
+import cStringIO
import struct
-try:
- from cStringIO import StringIO
-except ImportError:
- from StringIO import StringIO
+
+StringIO = cStringIO.StringIO
# This attempts to apply a series of patches in time proportional to
# the total size of the patches, rather than patches * len(text). This