--- a/mercurial/manifest.py Mon Dec 21 21:32:58 2015 -0800
+++ b/mercurial/manifest.py Mon Dec 21 21:35:46 2015 -0800
@@ -5,11 +5,21 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-from i18n import _
-import mdiff, parsers, error, revlog, util
-import array, struct
+from __future__ import absolute_import
+
+import array
+import heapq
import os
-import heapq
+import struct
+
+from .i18n import _
+from . import (
+ error,
+ mdiff,
+ parsers,
+ revlog,
+ util,
+)
propertycache = util.propertycache
--- a/tests/test-check-py3-compat.t Mon Dec 21 21:32:58 2015 -0800
+++ b/tests/test-check-py3-compat.t Mon Dec 21 21:35:46 2015 -0800
@@ -116,7 +116,6 @@
mercurial/lsprofcalltree.py not using absolute_import
mercurial/lsprofcalltree.py requires print_function
mercurial/mail.py requires print_function
- mercurial/manifest.py not using absolute_import
setup.py not using absolute_import
tests/filterpyflakes.py requires print_function
tests/generate-working-copy-states.py requires print_function