# HG changeset patch # User Gregory Szorc # Date 2015-12-22 05:31:57 # Node ID 5bfd01a3c2a9e5b93373a986b55efcc17a6aacea # Parent 60183975b5bc8b612603e12a2105c724160eab1d py3compat: use absolute_import diff --git a/mercurial/py3kcompat.py b/mercurial/py3kcompat.py --- a/mercurial/py3kcompat.py +++ b/mercurial/py3kcompat.py @@ -5,9 +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. -import builtins +from __future__ import absolute_import -from numbers import Number +import builtins +import numbers + +Number = numbers.Number def bytesformatter(format, args): '''Custom implementation of a formatter for bytestrings. diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -118,7 +118,6 @@ mercurial/mail.py requires print_function mercurial/manifest.py not using absolute_import mercurial/pvec.py not using absolute_import - mercurial/py3kcompat.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