diff --git a/contrib/bdiff-torture.py b/contrib/bdiff-torture.py --- a/contrib/bdiff-torture.py +++ b/contrib/bdiff-torture.py @@ -1,6 +1,5 @@ # Randomized torture test generation for bdiff -from __future__ import absolute_import, print_function import random import sys diff --git a/contrib/benchmarks/__init__.py b/contrib/benchmarks/__init__.py --- a/contrib/benchmarks/__init__.py +++ b/contrib/benchmarks/__init__.py @@ -31,7 +31,6 @@ $ asv --config contrib/asv.conf.json preview ''' -from __future__ import absolute_import import functools import os diff --git a/contrib/benchmarks/perf.py b/contrib/benchmarks/perf.py --- a/contrib/benchmarks/perf.py +++ b/contrib/benchmarks/perf.py @@ -5,7 +5,6 @@ # 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 from . import perfbench diff --git a/contrib/benchmarks/revset.py b/contrib/benchmarks/revset.py --- a/contrib/benchmarks/revset.py +++ b/contrib/benchmarks/revset.py @@ -10,7 +10,6 @@ Each revset benchmark is parameterized with variants (first, last, sort, ...) ''' -from __future__ import absolute_import import os import string diff --git a/contrib/byteify-strings.py b/contrib/byteify-strings.py --- a/contrib/byteify-strings.py +++ b/contrib/byteify-strings.py @@ -7,7 +7,6 @@ # 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, print_function import argparse import contextlib diff --git a/contrib/casesmash.py b/contrib/casesmash.py --- a/contrib/casesmash.py +++ b/contrib/casesmash.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import __builtin__ import os from mercurial import util diff --git a/contrib/catapipe.py b/contrib/catapipe.py --- a/contrib/catapipe.py +++ b/contrib/catapipe.py @@ -34,7 +34,6 @@ HGCATAPULTSERVERPIPE environment variable, which both run-tests and hg understand. To trace *only* run-tests, use HGTESTCATAPULTSERVERPIPE instead. """ -from __future__ import absolute_import, print_function import argparse import json diff --git a/contrib/check-code.py b/contrib/check-code.py --- a/contrib/check-code.py +++ b/contrib/check-code.py @@ -19,7 +19,6 @@ * ONLY use no--check-code for skipping entire files from external sources """ -from __future__ import absolute_import, print_function import glob import keyword import optparse diff --git a/contrib/check-commit b/contrib/check-commit --- a/contrib/check-commit +++ b/contrib/check-commit @@ -15,7 +15,6 @@ # # See also: https://mercurial-scm.org/wiki/ContributingChanges -from __future__ import absolute_import, print_function import os import re diff --git a/contrib/check-config.py b/contrib/check-config.py --- a/contrib/check-config.py +++ b/contrib/check-config.py @@ -7,7 +7,6 @@ # 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, print_function import re import sys diff --git a/contrib/check-py3-compat.py b/contrib/check-py3-compat.py --- a/contrib/check-py3-compat.py +++ b/contrib/check-py3-compat.py @@ -7,7 +7,6 @@ # 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, print_function import ast import importlib diff --git a/contrib/debugcmdserver.py b/contrib/debugcmdserver.py --- a/contrib/debugcmdserver.py +++ b/contrib/debugcmdserver.py @@ -7,7 +7,6 @@ # $ ./hg serve --cmds pipe | ./contrib/debugcmdserver.py - # o, 52 -> 'capabilities: getencoding runcommand\nencoding: UTF-8' -from __future__ import absolute_import, print_function import struct import sys diff --git a/contrib/debugshell.py b/contrib/debugshell.py --- a/contrib/debugshell.py +++ b/contrib/debugshell.py @@ -1,7 +1,6 @@ # debugshell extension """a python shell with repo, changelog & manifest objects""" -from __future__ import absolute_import import code import mercurial import sys diff --git a/contrib/dumprevlog b/contrib/dumprevlog --- a/contrib/dumprevlog +++ b/contrib/dumprevlog @@ -2,7 +2,6 @@ # Dump revlogs as raw data stream # $ find .hg/store/ -name "*.i" | xargs dumprevlog > repo.dump -from __future__ import absolute_import, print_function import sys from mercurial.node import hex diff --git a/contrib/fuzz/dirs_corpus.py b/contrib/fuzz/dirs_corpus.py --- a/contrib/fuzz/dirs_corpus.py +++ b/contrib/fuzz/dirs_corpus.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import argparse import zipfile diff --git a/contrib/fuzz/dirstate_corpus.py b/contrib/fuzz/dirstate_corpus.py --- a/contrib/fuzz/dirstate_corpus.py +++ b/contrib/fuzz/dirstate_corpus.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import argparse import os import zipfile diff --git a/contrib/fuzz/fm1readmarkers_corpus.py b/contrib/fuzz/fm1readmarkers_corpus.py --- a/contrib/fuzz/fm1readmarkers_corpus.py +++ b/contrib/fuzz/fm1readmarkers_corpus.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import argparse import zipfile diff --git a/contrib/fuzz/manifest_corpus.py b/contrib/fuzz/manifest_corpus.py --- a/contrib/fuzz/manifest_corpus.py +++ b/contrib/fuzz/manifest_corpus.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import argparse import zipfile diff --git a/contrib/fuzz/mpatch_corpus.py b/contrib/fuzz/mpatch_corpus.py --- a/contrib/fuzz/mpatch_corpus.py +++ b/contrib/fuzz/mpatch_corpus.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import argparse import os import struct diff --git a/contrib/fuzz/revlog_corpus.py b/contrib/fuzz/revlog_corpus.py --- a/contrib/fuzz/revlog_corpus.py +++ b/contrib/fuzz/revlog_corpus.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import argparse import os import zipfile diff --git a/contrib/genosxversion.py b/contrib/genosxversion.py --- a/contrib/genosxversion.py +++ b/contrib/genosxversion.py @@ -1,5 +1,4 @@ #!/usr/bin/env python2 -from __future__ import absolute_import, print_function import argparse import os diff --git a/contrib/hg-ssh b/contrib/hg-ssh --- a/contrib/hg-ssh +++ b/contrib/hg-ssh @@ -28,7 +28,6 @@ You can also add a --read-only flag to allow read-only access to a key, e.g.: command="hg-ssh --read-only repos/*" """ -from __future__ import absolute_import import os import re diff --git a/contrib/hgclient.py b/contrib/hgclient.py --- a/contrib/hgclient.py +++ b/contrib/hgclient.py @@ -1,6 +1,5 @@ # A minimal client for Mercurial's command server -from __future__ import absolute_import, print_function import io import os diff --git a/contrib/import-checker.py b/contrib/import-checker.py --- a/contrib/import-checker.py +++ b/contrib/import-checker.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import absolute_import, print_function import ast import collections diff --git a/contrib/memory.py b/contrib/memory.py --- a/contrib/memory.py +++ b/contrib/memory.py @@ -11,8 +11,6 @@ prints it to ``stderr`` on exit. ''' -from __future__ import absolute_import - def memusage(ui): """Report memory usage of the current process.""" diff --git a/contrib/perf-utils/perf-revlog-write-plot.py b/contrib/perf-utils/perf-revlog-write-plot.py --- a/contrib/perf-utils/perf-revlog-write-plot.py +++ b/contrib/perf-utils/perf-revlog-write-plot.py @@ -9,7 +9,6 @@ # various plot related to write performance in a revlog # # usage: perf-revlog-write-plot.py details.json -from __future__ import absolute_import, print_function import json import re diff --git a/contrib/perf-utils/search-discovery-case b/contrib/perf-utils/search-discovery-case --- a/contrib/perf-utils/search-discovery-case +++ b/contrib/perf-utils/search-discovery-case @@ -6,7 +6,6 @@ # This use a subsetmaker extension (next to this script) to generate a steam of # random discovery instance. When interesting case are discovered, information # about them are print on the stdout. -from __future__ import print_function import json import os diff --git a/contrib/perf.py b/contrib/perf.py --- a/contrib/perf.py +++ b/contrib/perf.py @@ -54,7 +54,6 @@ # - make perf command for recent feature work correctly with early # Mercurial -from __future__ import absolute_import import contextlib import functools import gc diff --git a/contrib/phab-clean.py b/contrib/phab-clean.py --- a/contrib/phab-clean.py +++ b/contrib/phab-clean.py @@ -3,7 +3,6 @@ # A small script to automatically reject idle Diffs # # you need to set the PHABBOT_USER and PHABBOT_TOKEN environment variable for authentication -from __future__ import absolute_import, print_function import datetime import os diff --git a/contrib/python-hook-examples.py b/contrib/python-hook-examples.py --- a/contrib/python-hook-examples.py +++ b/contrib/python-hook-examples.py @@ -1,7 +1,6 @@ ''' Examples of useful python hooks for Mercurial. ''' -from __future__ import absolute_import from mercurial import ( patch, util, diff --git a/contrib/python-zstandard/make_cffi.py b/contrib/python-zstandard/make_cffi.py --- a/contrib/python-zstandard/make_cffi.py +++ b/contrib/python-zstandard/make_cffi.py @@ -4,7 +4,6 @@ # This software may be modified and distributed under the terms # of the BSD license. See the LICENSE file for details. -from __future__ import absolute_import import cffi import distutils.ccompiler diff --git a/contrib/python-zstandard/setup.py b/contrib/python-zstandard/setup.py --- a/contrib/python-zstandard/setup.py +++ b/contrib/python-zstandard/setup.py @@ -5,7 +5,6 @@ # This software may be modified and distributed under the terms # of the BSD license. See the LICENSE file for details. -from __future__ import print_function from distutils.version import LooseVersion import os diff --git a/contrib/python-zstandard/tests/test_module_attributes.py b/contrib/python-zstandard/tests/test_module_attributes.py --- a/contrib/python-zstandard/tests/test_module_attributes.py +++ b/contrib/python-zstandard/tests/test_module_attributes.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest import zstandard as zstd diff --git a/contrib/python-zstandard/zstandard/__init__.py b/contrib/python-zstandard/zstandard/__init__.py --- a/contrib/python-zstandard/zstandard/__init__.py +++ b/contrib/python-zstandard/zstandard/__init__.py @@ -6,7 +6,6 @@ """Python interface to the Zstandard (zstd) compression library.""" -from __future__ import absolute_import, unicode_literals # This module serves 2 roles: # diff --git a/contrib/python-zstandard/zstandard/cffi.py b/contrib/python-zstandard/zstandard/cffi.py --- a/contrib/python-zstandard/zstandard/cffi.py +++ b/contrib/python-zstandard/zstandard/cffi.py @@ -6,7 +6,6 @@ """Python interface to the Zstandard (zstd) compression library.""" -from __future__ import absolute_import, unicode_literals # This should match what the C extension exports. __all__ = [ diff --git a/contrib/python3-ratchet.py b/contrib/python3-ratchet.py --- a/contrib/python3-ratchet.py +++ b/contrib/python3-ratchet.py @@ -15,8 +15,6 @@ $ python3 ../contrib/python3-ratchet.py \ > --working-tests=../contrib/python3-whitelist """ -from __future__ import print_function -from __future__ import absolute_import import argparse import json diff --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py --- a/contrib/revsetbenchmarks.py +++ b/contrib/revsetbenchmarks.py @@ -8,7 +8,6 @@ # # call with --help for details -from __future__ import absolute_import, print_function import math import optparse # cannot use argparse, python 2.7 only import os diff --git a/contrib/showstack.py b/contrib/showstack.py --- a/contrib/showstack.py +++ b/contrib/showstack.py @@ -4,7 +4,6 @@ r"""dump stack trace when receiving SIGQUIT (Ctrl-\) or SIGINFO (Ctrl-T on BSDs) """ -from __future__ import absolute_import, print_function import signal import sys import traceback diff --git a/contrib/simplemerge b/contrib/simplemerge --- a/contrib/simplemerge +++ b/contrib/simplemerge @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -from __future__ import absolute_import import getopt import sys diff --git a/contrib/synthrepo.py b/contrib/synthrepo.py --- a/contrib/synthrepo.py +++ b/contrib/synthrepo.py @@ -36,7 +36,6 @@ - Symlinks and binary files are ignored ''' -from __future__ import absolute_import import bisect import collections import itertools diff --git a/contrib/testparseutil.py b/contrib/testparseutil.py --- a/contrib/testparseutil.py +++ b/contrib/testparseutil.py @@ -5,7 +5,6 @@ # 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, print_function import abc import re diff --git a/contrib/undumprevlog b/contrib/undumprevlog --- a/contrib/undumprevlog +++ b/contrib/undumprevlog @@ -3,7 +3,6 @@ # $ hg init # $ undumprevlog < repo.dump -from __future__ import absolute_import, print_function import sys from mercurial.node import bin diff --git a/contrib/win32/hgwebdir_wsgi.py b/contrib/win32/hgwebdir_wsgi.py --- a/contrib/win32/hgwebdir_wsgi.py +++ b/contrib/win32/hgwebdir_wsgi.py @@ -78,7 +78,6 @@ # - Restart the web server and see if things are running. # -from __future__ import absolute_import # Configuration file location hgweb_config = r'c:\your\directory\wsgi.config' diff --git a/doc/check-seclevel.py b/doc/check-seclevel.py --- a/doc/check-seclevel.py +++ b/doc/check-seclevel.py @@ -2,7 +2,6 @@ # # checkseclevel - checking section title levels in each online help document -from __future__ import absolute_import import optparse import os diff --git a/doc/docchecker b/doc/docchecker --- a/doc/docchecker +++ b/doc/docchecker @@ -7,7 +7,6 @@ # 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, print_function import os import re diff --git a/doc/gendoc.py b/doc/gendoc.py --- a/doc/gendoc.py +++ b/doc/gendoc.py @@ -4,7 +4,6 @@ where DOC is the name of a document """ -from __future__ import absolute_import import os import sys diff --git a/doc/hgmanpage.py b/doc/hgmanpage.py --- a/doc/hgmanpage.py +++ b/doc/hgmanpage.py @@ -41,7 +41,6 @@ by the command whatis or apropos. """ -from __future__ import absolute_import __docformat__ = 'reStructuredText' diff --git a/doc/runrst b/doc/runrst --- a/doc/runrst +++ b/doc/runrst @@ -12,7 +12,6 @@ where WRITER is the name of a Docutils writer such as 'html' or 'manpage' """ -from __future__ import absolute_import import sys diff --git a/hg b/hg --- a/hg +++ b/hg @@ -6,7 +6,6 @@ # # 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 os import sys diff --git a/hgdemandimport/__init__.py b/hgdemandimport/__init__.py --- a/hgdemandimport/__init__.py +++ b/hgdemandimport/__init__.py @@ -11,7 +11,6 @@ # demand loading is per-package. Keeping demandimport in the mercurial package # would disable demand loading for any modules in mercurial. -from __future__ import absolute_import import os import sys diff --git a/hgdemandimport/demandimportpy2.py b/hgdemandimport/demandimportpy2.py --- a/hgdemandimport/demandimportpy2.py +++ b/hgdemandimport/demandimportpy2.py @@ -24,7 +24,6 @@ b = __import__(a) ''' -from __future__ import absolute_import import __builtin__ as builtins import contextlib diff --git a/hgdemandimport/demandimportpy3.py b/hgdemandimport/demandimportpy3.py --- a/hgdemandimport/demandimportpy3.py +++ b/hgdemandimport/demandimportpy3.py @@ -24,7 +24,6 @@ """ # This line is unnecessary, but it satisfies test-check-py3-compat.t. -from __future__ import absolute_import import contextlib import importlib.util diff --git a/hgdemandimport/tracing.py b/hgdemandimport/tracing.py --- a/hgdemandimport/tracing.py +++ b/hgdemandimport/tracing.py @@ -5,7 +5,6 @@ # # 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 contextlib import os diff --git a/hgext/__init__.py b/hgext/__init__.py --- a/hgext/__init__.py +++ b/hgext/__init__.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import pkgutil __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/hgext/absorb.py b/hgext/absorb.py --- a/hgext/absorb.py +++ b/hgext/absorb.py @@ -31,7 +31,6 @@ # * Converge getdraftstack() with other code in core # * move many attributes on fixupstate to be private -from __future__ import absolute_import import collections diff --git a/hgext/acl.py b/hgext/acl.py --- a/hgext/acl.py +++ b/hgext/acl.py @@ -213,7 +213,6 @@ ''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/amend.py b/hgext/amend.py --- a/hgext/amend.py +++ b/hgext/amend.py @@ -10,7 +10,6 @@ ``commit --amend`` but does not prompt an editor. """ -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/automv.py b/hgext/automv.py --- a/hgext/automv.py +++ b/hgext/automv.py @@ -24,7 +24,6 @@ # # See http://markmail.org/thread/5pxnljesvufvom57 for context. -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/beautifygraph.py b/hgext/beautifygraph.py --- a/hgext/beautifygraph.py +++ b/hgext/beautifygraph.py @@ -11,7 +11,6 @@ A terminal with UTF-8 support and monospace narrow text are required. ''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/blackbox.py b/hgext/blackbox.py --- a/hgext/blackbox.py +++ b/hgext/blackbox.py @@ -42,7 +42,6 @@ """ -from __future__ import absolute_import import re diff --git a/hgext/bookflow.py b/hgext/bookflow.py --- a/hgext/bookflow.py +++ b/hgext/bookflow.py @@ -13,7 +13,6 @@ :hg up|co NAME: switch to bookmark :hg push -B .: push active bookmark """ -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/bugzilla.py b/hgext/bugzilla.py --- a/hgext/bugzilla.py +++ b/hgext/bugzilla.py @@ -291,7 +291,6 @@ Changeset commit comment. Bug 1234. ''' -from __future__ import absolute_import import json import re diff --git a/hgext/censor.py b/hgext/censor.py --- a/hgext/censor.py +++ b/hgext/censor.py @@ -28,7 +28,6 @@ ignore censored data and merely report that it was encountered. """ -from __future__ import absolute_import from mercurial.i18n import _ from mercurial.node import short diff --git a/hgext/children.py b/hgext/children.py --- a/hgext/children.py +++ b/hgext/children.py @@ -14,7 +14,6 @@ "children(REV)"` instead. ''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/churn.py b/hgext/churn.py --- a/hgext/churn.py +++ b/hgext/churn.py @@ -8,7 +8,6 @@ '''command to display statistics about repository history''' -from __future__ import absolute_import, division import datetime import os diff --git a/hgext/clonebundles.py b/hgext/clonebundles.py --- a/hgext/clonebundles.py +++ b/hgext/clonebundles.py @@ -202,7 +202,6 @@ Mercurial server when the bundle hosting service fails. """ -from __future__ import absolute_import from mercurial import ( bundlecaches, diff --git a/hgext/closehead.py b/hgext/closehead.py --- a/hgext/closehead.py +++ b/hgext/closehead.py @@ -5,7 +5,6 @@ '''close arbitrary heads without checking them out first''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/commitextras.py b/hgext/commitextras.py --- a/hgext/commitextras.py +++ b/hgext/commitextras.py @@ -7,7 +7,6 @@ '''adds a new flag extras to commit (ADVANCED)''' -from __future__ import absolute_import import re diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -7,7 +7,6 @@ '''import revisions from foreign VCS repositories into Mercurial''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import registrar diff --git a/hgext/convert/bzr.py b/hgext/convert/bzr.py --- a/hgext/convert/bzr.py +++ b/hgext/convert/bzr.py @@ -8,7 +8,6 @@ # This module is for handling Breezy imports or `brz`, but it's also compatible # with Bazaar or `bzr`, that was formerly known as Bazaar-NG; # it cannot access `bar` repositories, but they were never used very much. -from __future__ import absolute_import import os diff --git a/hgext/convert/common.py b/hgext/convert/common.py --- a/hgext/convert/common.py +++ b/hgext/convert/common.py @@ -4,7 +4,6 @@ # # 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 base64 import datetime diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py +++ b/hgext/convert/convcmd.py @@ -4,7 +4,6 @@ # # 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 collections import os diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py --- a/hgext/convert/cvs.py +++ b/hgext/convert/cvs.py @@ -4,7 +4,6 @@ # # 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 errno import os diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py +++ b/hgext/convert/cvsps.py @@ -4,7 +4,6 @@ # # 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 functools import os diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py --- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py @@ -4,7 +4,6 @@ # # 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 errno import os diff --git a/hgext/convert/filemap.py b/hgext/convert/filemap.py --- a/hgext/convert/filemap.py +++ b/hgext/convert/filemap.py @@ -4,7 +4,6 @@ # 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, print_function import posixpath diff --git a/hgext/convert/git.py b/hgext/convert/git.py --- a/hgext/convert/git.py +++ b/hgext/convert/git.py @@ -4,7 +4,6 @@ # # 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 os diff --git a/hgext/convert/gnuarch.py b/hgext/convert/gnuarch.py --- a/hgext/convert/gnuarch.py +++ b/hgext/convert/gnuarch.py @@ -5,7 +5,6 @@ # # 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 os import shutil diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -16,7 +16,6 @@ # identifier to be stored in the converted revision. This will cause # the converted revision to have a different identity than the # source. -from __future__ import absolute_import import os import re diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py --- a/hgext/convert/monotone.py +++ b/hgext/convert/monotone.py @@ -5,7 +5,6 @@ # # 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 os import re diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py --- a/hgext/convert/p4.py +++ b/hgext/convert/p4.py @@ -4,7 +4,6 @@ # # 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 marshal import re diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -1,7 +1,6 @@ # Subversion 1.4/1.5 Python API backend # # Copyright(C) 2007 Daniel Holth et al -from __future__ import absolute_import import codecs import locale diff --git a/hgext/convert/transport.py b/hgext/convert/transport.py --- a/hgext/convert/transport.py +++ b/hgext/convert/transport.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -from __future__ import absolute_import import svn.client import svn.core diff --git a/hgext/eol.py b/hgext/eol.py --- a/hgext/eol.py +++ b/hgext/eol.py @@ -91,7 +91,6 @@ used. """ -from __future__ import absolute_import import os import re diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -81,7 +81,6 @@ pretty fast (at least faster than having to compare the entire tree). ''' -from __future__ import absolute_import import os import re diff --git a/hgext/factotum.py b/hgext/factotum.py --- a/hgext/factotum.py +++ b/hgext/factotum.py @@ -45,7 +45,6 @@ ''' -from __future__ import absolute_import import os from mercurial.i18n import _ diff --git a/hgext/fastannotate/__init__.py b/hgext/fastannotate/__init__.py --- a/hgext/fastannotate/__init__.py +++ b/hgext/fastannotate/__init__.py @@ -101,7 +101,6 @@ # # * format changes to the revmap file (maybe use length-encoding # instead of null-terminated file paths at least?) -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/fastannotate/commands.py b/hgext/fastannotate/commands.py --- a/hgext/fastannotate/commands.py +++ b/hgext/fastannotate/commands.py @@ -5,7 +5,6 @@ # 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 os diff --git a/hgext/fastannotate/context.py b/hgext/fastannotate/context.py --- a/hgext/fastannotate/context.py +++ b/hgext/fastannotate/context.py @@ -5,7 +5,6 @@ # 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 collections import contextlib diff --git a/hgext/fastannotate/error.py b/hgext/fastannotate/error.py --- a/hgext/fastannotate/error.py +++ b/hgext/fastannotate/error.py @@ -4,7 +4,6 @@ # # 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 class CorruptedFileError(Exception): diff --git a/hgext/fastannotate/formatter.py b/hgext/fastannotate/formatter.py --- a/hgext/fastannotate/formatter.py +++ b/hgext/fastannotate/formatter.py @@ -4,7 +4,6 @@ # # 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 from mercurial.node import ( hex, diff --git a/hgext/fastannotate/protocol.py b/hgext/fastannotate/protocol.py --- a/hgext/fastannotate/protocol.py +++ b/hgext/fastannotate/protocol.py @@ -4,7 +4,6 @@ # # 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 contextlib import os diff --git a/hgext/fastannotate/revmap.py b/hgext/fastannotate/revmap.py --- a/hgext/fastannotate/revmap.py +++ b/hgext/fastannotate/revmap.py @@ -5,7 +5,6 @@ # 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 bisect import io diff --git a/hgext/fastannotate/support.py b/hgext/fastannotate/support.py --- a/hgext/fastannotate/support.py +++ b/hgext/fastannotate/support.py @@ -5,7 +5,6 @@ # 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 from mercurial.pycompat import getattr from mercurial import ( diff --git a/hgext/fastexport.py b/hgext/fastexport.py --- a/hgext/fastexport.py +++ b/hgext/fastexport.py @@ -7,7 +7,6 @@ # The format specification for fast-import streams can be found at # https://git-scm.com/docs/git-fast-import#_input_format -from __future__ import absolute_import import re from mercurial.i18n import _ diff --git a/hgext/fetch.py b/hgext/fetch.py --- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -7,7 +7,6 @@ '''pull, update and merge in one command (DEPRECATED)''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial.node import short diff --git a/hgext/fix.py b/hgext/fix.py --- a/hgext/fix.py +++ b/hgext/fix.py @@ -122,7 +122,6 @@ file content back to stdout as documented above. """ -from __future__ import absolute_import import collections import itertools diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py --- a/hgext/fsmonitor/__init__.py +++ b/hgext/fsmonitor/__init__.py @@ -107,7 +107,6 @@ # The issues related to nested repos and subrepos are probably not fundamental # ones. Patches to fix them are welcome. -from __future__ import absolute_import import codecs import os diff --git a/hgext/fsmonitor/pywatchman/__init__.py b/hgext/fsmonitor/pywatchman/__init__.py --- a/hgext/fsmonitor/pywatchman/__init__.py +++ b/hgext/fsmonitor/pywatchman/__init__.py @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # no unicode literals -from __future__ import absolute_import, division, print_function import inspect import math diff --git a/hgext/fsmonitor/pywatchman/capabilities.py b/hgext/fsmonitor/pywatchman/capabilities.py --- a/hgext/fsmonitor/pywatchman/capabilities.py +++ b/hgext/fsmonitor/pywatchman/capabilities.py @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # no unicode literals -from __future__ import absolute_import, division, print_function def parse_version(vstr): diff --git a/hgext/fsmonitor/pywatchman/compat.py b/hgext/fsmonitor/pywatchman/compat.py --- a/hgext/fsmonitor/pywatchman/compat.py +++ b/hgext/fsmonitor/pywatchman/compat.py @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # no unicode literals -from __future__ import absolute_import, division, print_function import sys diff --git a/hgext/fsmonitor/pywatchman/encoding.py b/hgext/fsmonitor/pywatchman/encoding.py --- a/hgext/fsmonitor/pywatchman/encoding.py +++ b/hgext/fsmonitor/pywatchman/encoding.py @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # no unicode literals -from __future__ import absolute_import, division, print_function import sys diff --git a/hgext/fsmonitor/pywatchman/load.py b/hgext/fsmonitor/pywatchman/load.py --- a/hgext/fsmonitor/pywatchman/load.py +++ b/hgext/fsmonitor/pywatchman/load.py @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # no unicode literals -from __future__ import absolute_import, division, print_function import ctypes diff --git a/hgext/fsmonitor/pywatchman/pybser.py b/hgext/fsmonitor/pywatchman/pybser.py --- a/hgext/fsmonitor/pywatchman/pybser.py +++ b/hgext/fsmonitor/pywatchman/pybser.py @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # no unicode literals -from __future__ import absolute_import, division, print_function import binascii import collections diff --git a/hgext/fsmonitor/state.py b/hgext/fsmonitor/state.py --- a/hgext/fsmonitor/state.py +++ b/hgext/fsmonitor/state.py @@ -5,7 +5,6 @@ # 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 errno import os diff --git a/hgext/fsmonitor/watchmanclient.py b/hgext/fsmonitor/watchmanclient.py --- a/hgext/fsmonitor/watchmanclient.py +++ b/hgext/fsmonitor/watchmanclient.py @@ -5,7 +5,6 @@ # 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 getpass diff --git a/hgext/git/__init__.py b/hgext/git/__init__.py --- a/hgext/git/__init__.py +++ b/hgext/git/__init__.py @@ -4,7 +4,6 @@ firstborn a la Rumpelstiltskin, etc. """ -from __future__ import absolute_import import os diff --git a/hgext/git/dirstate.py b/hgext/git/dirstate.py --- a/hgext/git/dirstate.py +++ b/hgext/git/dirstate.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import contextlib import errno import os diff --git a/hgext/git/gitlog.py b/hgext/git/gitlog.py --- a/hgext/git/gitlog.py +++ b/hgext/git/gitlog.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from mercurial.i18n import _ from mercurial.node import ( diff --git a/hgext/git/gitutil.py b/hgext/git/gitutil.py --- a/hgext/git/gitutil.py +++ b/hgext/git/gitutil.py @@ -1,5 +1,4 @@ """utilities to assist in working with pygit2""" -from __future__ import absolute_import from mercurial.node import bin, hex, sha1nodeconstants diff --git a/hgext/git/index.py b/hgext/git/index.py --- a/hgext/git/index.py +++ b/hgext/git/index.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import collections import os import sqlite3 diff --git a/hgext/git/manifest.py b/hgext/git/manifest.py --- a/hgext/git/manifest.py +++ b/hgext/git/manifest.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from mercurial import ( match as matchmod, pathutil, diff --git a/hgext/githelp.py b/hgext/githelp.py --- a/hgext/githelp.py +++ b/hgext/githelp.py @@ -15,7 +15,6 @@ produced. """ -from __future__ import absolute_import import getopt import re diff --git a/hgext/gpg.py b/hgext/gpg.py --- a/hgext/gpg.py +++ b/hgext/gpg.py @@ -5,7 +5,6 @@ '''commands to sign and verify changesets''' -from __future__ import absolute_import import binascii import os diff --git a/hgext/graphlog.py b/hgext/graphlog.py --- a/hgext/graphlog.py +++ b/hgext/graphlog.py @@ -15,7 +15,6 @@ revision graph is also shown. ''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/hgk.py b/hgext/hgk.py --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -34,7 +34,6 @@ vdiff on hovered and selected revisions. ''' -from __future__ import absolute_import import os diff --git a/hgext/highlight/__init__.py b/hgext/highlight/__init__.py --- a/hgext/highlight/__init__.py +++ b/hgext/highlight/__init__.py @@ -26,7 +26,6 @@ match (even matches with a low confidence score) will be used. """ -from __future__ import absolute_import from . import highlight from mercurial.hgweb import ( diff --git a/hgext/highlight/highlight.py b/hgext/highlight/highlight.py --- a/hgext/highlight/highlight.py +++ b/hgext/highlight/highlight.py @@ -8,7 +8,6 @@ # The original module was split in an interface and an implementation # file to defer pygments loading and speedup extension setup. -from __future__ import absolute_import from mercurial import demandimport diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -190,7 +190,6 @@ """ -from __future__ import absolute_import # chistedit dependencies that are not available everywhere try: diff --git a/hgext/hooklib/__init__.py b/hgext/hooklib/__init__.py --- a/hgext/hooklib/__init__.py +++ b/hgext/hooklib/__init__.py @@ -13,7 +13,6 @@ extension as option. The functionality itself is planned to be supported long-term. """ -from __future__ import absolute_import from . import ( changeset_obsoleted, changeset_published, diff --git a/hgext/hooklib/changeset_obsoleted.py b/hgext/hooklib/changeset_obsoleted.py --- a/hgext/hooklib/changeset_obsoleted.py +++ b/hgext/hooklib/changeset_obsoleted.py @@ -17,7 +17,6 @@ python:hgext.hooklib.changeset_obsoleted.hook """ -from __future__ import absolute_import import email.errors as emailerrors import email.utils as emailutils diff --git a/hgext/hooklib/changeset_published.py b/hgext/hooklib/changeset_published.py --- a/hgext/hooklib/changeset_published.py +++ b/hgext/hooklib/changeset_published.py @@ -17,7 +17,6 @@ python:hgext.hooklib.changeset_published.hook """ -from __future__ import absolute_import import email.errors as emailerrors import email.utils as emailutils diff --git a/hgext/hooklib/enforce_draft_commits.py b/hgext/hooklib/enforce_draft_commits.py --- a/hgext/hooklib/enforce_draft_commits.py +++ b/hgext/hooklib/enforce_draft_commits.py @@ -14,7 +14,6 @@ python:hgext.hooklib.enforce_draft_commits.hook """ -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/hooklib/reject_merge_commits.py b/hgext/hooklib/reject_merge_commits.py --- a/hgext/hooklib/reject_merge_commits.py +++ b/hgext/hooklib/reject_merge_commits.py @@ -14,7 +14,6 @@ python:hgext.hooklib.reject_merge_commits.hook """ -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/hooklib/reject_new_heads.py b/hgext/hooklib/reject_new_heads.py --- a/hgext/hooklib/reject_new_heads.py +++ b/hgext/hooklib/reject_new_heads.py @@ -14,7 +14,6 @@ python:hgext.hooklib.reject_new_heads.hook """ -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/infinitepush/__init__.py b/hgext/infinitepush/__init__.py --- a/hgext/infinitepush/__init__.py +++ b/hgext/infinitepush/__init__.py @@ -87,7 +87,6 @@ bookmarks = True """ -from __future__ import absolute_import import collections import contextlib diff --git a/hgext/infinitepush/bundleparts.py b/hgext/infinitepush/bundleparts.py --- a/hgext/infinitepush/bundleparts.py +++ b/hgext/infinitepush/bundleparts.py @@ -3,7 +3,6 @@ # 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 from mercurial.i18n import _ from mercurial.node import hex diff --git a/hgext/infinitepush/common.py b/hgext/infinitepush/common.py --- a/hgext/infinitepush/common.py +++ b/hgext/infinitepush/common.py @@ -3,7 +3,6 @@ # 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 os diff --git a/hgext/infinitepush/fileindexapi.py b/hgext/infinitepush/fileindexapi.py --- a/hgext/infinitepush/fileindexapi.py +++ b/hgext/infinitepush/fileindexapi.py @@ -11,7 +11,6 @@ indexpath = PATH """ -from __future__ import absolute_import import os diff --git a/hgext/infinitepush/indexapi.py b/hgext/infinitepush/indexapi.py --- a/hgext/infinitepush/indexapi.py +++ b/hgext/infinitepush/indexapi.py @@ -5,8 +5,6 @@ # 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 - class indexapi(object): """Class that manages access to infinitepush index. diff --git a/hgext/infinitepush/sqlindexapi.py b/hgext/infinitepush/sqlindexapi.py --- a/hgext/infinitepush/sqlindexapi.py +++ b/hgext/infinitepush/sqlindexapi.py @@ -5,7 +5,6 @@ # 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 logging import os diff --git a/hgext/infinitepush/store.py b/hgext/infinitepush/store.py --- a/hgext/infinitepush/store.py +++ b/hgext/infinitepush/store.py @@ -3,7 +3,6 @@ # based on bundleheads extension by Gregory Szorc -from __future__ import absolute_import import abc import os diff --git a/hgext/journal.py b/hgext/journal.py --- a/hgext/journal.py +++ b/hgext/journal.py @@ -11,7 +11,6 @@ """ -from __future__ import absolute_import import collections import errno diff --git a/hgext/keyword.py b/hgext/keyword.py --- a/hgext/keyword.py +++ b/hgext/keyword.py @@ -83,8 +83,6 @@ ''' -from __future__ import absolute_import - import os import re import weakref diff --git a/hgext/largefiles/__init__.py b/hgext/largefiles/__init__.py --- a/hgext/largefiles/__init__.py +++ b/hgext/largefiles/__init__.py @@ -104,7 +104,6 @@ explicitly do so with the --large flag passed to the :hg:`add` command. ''' -from __future__ import absolute_import from mercurial import ( cmdutil, diff --git a/hgext/largefiles/basestore.py b/hgext/largefiles/basestore.py --- a/hgext/largefiles/basestore.py +++ b/hgext/largefiles/basestore.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. '''base class for store implementations and store-related utility code''' -from __future__ import absolute_import from mercurial.i18n import _ diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py --- a/hgext/largefiles/lfcommands.py +++ b/hgext/largefiles/lfcommands.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. '''High-level command function for lfconvert, plus the cmdtable.''' -from __future__ import absolute_import import errno import os diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py --- a/hgext/largefiles/lfutil.py +++ b/hgext/largefiles/lfutil.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. '''largefiles utility code: must not import other modules in this package.''' -from __future__ import absolute_import import contextlib import copy diff --git a/hgext/largefiles/localstore.py b/hgext/largefiles/localstore.py --- a/hgext/largefiles/localstore.py +++ b/hgext/largefiles/localstore.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. '''store class for local filesystem''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial.pycompat import open diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. '''Overridden Mercurial commands and functions for the largefiles extension''' -from __future__ import absolute_import import copy import os diff --git a/hgext/largefiles/proto.py b/hgext/largefiles/proto.py --- a/hgext/largefiles/proto.py +++ b/hgext/largefiles/proto.py @@ -2,7 +2,6 @@ # # 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 os diff --git a/hgext/largefiles/remotestore.py b/hgext/largefiles/remotestore.py --- a/hgext/largefiles/remotestore.py +++ b/hgext/largefiles/remotestore.py @@ -5,7 +5,6 @@ # GNU General Public License version 2 or any later version. '''remote largefile store; the base class for wirestore''' -from __future__ import absolute_import from mercurial.i18n import _ diff --git a/hgext/largefiles/reposetup.py b/hgext/largefiles/reposetup.py --- a/hgext/largefiles/reposetup.py +++ b/hgext/largefiles/reposetup.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. '''setup for largefiles repositories: reposetup''' -from __future__ import absolute_import import copy diff --git a/hgext/largefiles/storefactory.py b/hgext/largefiles/storefactory.py --- a/hgext/largefiles/storefactory.py +++ b/hgext/largefiles/storefactory.py @@ -1,7 +1,6 @@ # 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 re diff --git a/hgext/largefiles/wirestore.py b/hgext/largefiles/wirestore.py --- a/hgext/largefiles/wirestore.py +++ b/hgext/largefiles/wirestore.py @@ -4,7 +4,6 @@ # GNU General Public License version 2 or any later version. '''largefile store working over Mercurial's wire protocol''' -from __future__ import absolute_import from . import ( lfutil, diff --git a/hgext/lfs/__init__.py b/hgext/lfs/__init__.py --- a/hgext/lfs/__init__.py +++ b/hgext/lfs/__init__.py @@ -120,7 +120,6 @@ usercache = /path/to/global/cache """ -from __future__ import absolute_import import sys diff --git a/hgext/lfs/blobstore.py b/hgext/lfs/blobstore.py --- a/hgext/lfs/blobstore.py +++ b/hgext/lfs/blobstore.py @@ -5,7 +5,6 @@ # 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 contextlib import errno diff --git a/hgext/lfs/pointer.py b/hgext/lfs/pointer.py --- a/hgext/lfs/pointer.py +++ b/hgext/lfs/pointer.py @@ -5,7 +5,6 @@ # 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 re diff --git a/hgext/lfs/wireprotolfsserver.py b/hgext/lfs/wireprotolfsserver.py --- a/hgext/lfs/wireprotolfsserver.py +++ b/hgext/lfs/wireprotolfsserver.py @@ -5,7 +5,6 @@ # 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 datetime import errno diff --git a/hgext/lfs/wrapper.py b/hgext/lfs/wrapper.py --- a/hgext/lfs/wrapper.py +++ b/hgext/lfs/wrapper.py @@ -5,7 +5,6 @@ # 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 hashlib diff --git a/hgext/logtoprocess.py b/hgext/logtoprocess.py --- a/hgext/logtoprocess.py +++ b/hgext/logtoprocess.py @@ -32,7 +32,6 @@ """ -from __future__ import absolute_import import os diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -62,7 +62,6 @@ in the strip extension. ''' -from __future__ import absolute_import, print_function import errno import os diff --git a/hgext/narrow/__init__.py b/hgext/narrow/__init__.py --- a/hgext/narrow/__init__.py +++ b/hgext/narrow/__init__.py @@ -6,7 +6,6 @@ # GNU General Public License version 2 or any later version. '''create clones which fetch history data for subset of files (EXPERIMENTAL)''' -from __future__ import absolute_import from mercurial import ( localrepo, diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py --- a/hgext/narrow/narrowbundle2.py +++ b/hgext/narrow/narrowbundle2.py @@ -5,7 +5,6 @@ # 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 errno import struct diff --git a/hgext/narrow/narrowcommands.py b/hgext/narrow/narrowcommands.py --- a/hgext/narrow/narrowcommands.py +++ b/hgext/narrow/narrowcommands.py @@ -4,7 +4,6 @@ # # 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 itertools import os diff --git a/hgext/narrow/narrowdirstate.py b/hgext/narrow/narrowdirstate.py --- a/hgext/narrow/narrowdirstate.py +++ b/hgext/narrow/narrowdirstate.py @@ -5,7 +5,6 @@ # 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 from mercurial.i18n import _ from mercurial import error diff --git a/hgext/narrow/narrowrepo.py b/hgext/narrow/narrowrepo.py --- a/hgext/narrow/narrowrepo.py +++ b/hgext/narrow/narrowrepo.py @@ -5,7 +5,6 @@ # 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 from mercurial import wireprototypes diff --git a/hgext/narrow/narrowtemplates.py b/hgext/narrow/narrowtemplates.py --- a/hgext/narrow/narrowtemplates.py +++ b/hgext/narrow/narrowtemplates.py @@ -5,7 +5,6 @@ # 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 from mercurial import ( registrar, diff --git a/hgext/narrow/narrowwirepeer.py b/hgext/narrow/narrowwirepeer.py --- a/hgext/narrow/narrowwirepeer.py +++ b/hgext/narrow/narrowwirepeer.py @@ -5,7 +5,6 @@ # 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 from mercurial import ( bundle2, diff --git a/hgext/notify.py b/hgext/notify.py --- a/hgext/notify.py +++ b/hgext/notify.py @@ -154,7 +154,6 @@ references. See also ``notify.strip``. ''' -from __future__ import absolute_import import email.errors as emailerrors import email.utils as emailutils diff --git a/hgext/pager.py b/hgext/pager.py --- a/hgext/pager.py +++ b/hgext/pager.py @@ -21,7 +21,6 @@ [pager] attend-cat = false ''' -from __future__ import absolute_import from mercurial import ( cmdutil, diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -71,7 +71,6 @@ You can set patchbomb to always ask for confirmation by setting ``patchbomb.confirm`` to true. ''' -from __future__ import absolute_import import email.encoders as emailencoders import email.mime.base as emimebase diff --git a/hgext/phabricator.py b/hgext/phabricator.py --- a/hgext/phabricator.py +++ b/hgext/phabricator.py @@ -57,7 +57,6 @@ example.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx """ -from __future__ import absolute_import import base64 import contextlib diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -14,7 +14,6 @@ https://mercurial-scm.org/wiki/RebaseExtension ''' -from __future__ import absolute_import import errno import os diff --git a/hgext/record.py b/hgext/record.py --- a/hgext/record.py +++ b/hgext/record.py @@ -10,7 +10,6 @@ The feature provided by this extension has been moved into core Mercurial as :hg:`commit --interactive`.''' -from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( diff --git a/hgext/releasenotes.py b/hgext/releasenotes.py --- a/hgext/releasenotes.py +++ b/hgext/releasenotes.py @@ -11,7 +11,6 @@ process simpler by automating it. """ -from __future__ import absolute_import import difflib import errno diff --git a/hgext/relink.py b/hgext/relink.py --- a/hgext/relink.py +++ b/hgext/relink.py @@ -6,7 +6,6 @@ # GNU General Public License version 2 or any later version. """recreates hardlinks between repository clones""" -from __future__ import absolute_import import os import stat diff --git a/hgext/remotefilelog/__init__.py b/hgext/remotefilelog/__init__.py --- a/hgext/remotefilelog/__init__.py +++ b/hgext/remotefilelog/__init__.py @@ -124,7 +124,6 @@ corruption before returning metadata """ -from __future__ import absolute_import import os import time diff --git a/hgext/remotefilelog/basepack.py b/hgext/remotefilelog/basepack.py --- a/hgext/remotefilelog/basepack.py +++ b/hgext/remotefilelog/basepack.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import collections import errno import mmap diff --git a/hgext/remotefilelog/basestore.py b/hgext/remotefilelog/basestore.py --- a/hgext/remotefilelog/basestore.py +++ b/hgext/remotefilelog/basestore.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import errno import os import shutil diff --git a/hgext/remotefilelog/connectionpool.py b/hgext/remotefilelog/connectionpool.py --- a/hgext/remotefilelog/connectionpool.py +++ b/hgext/remotefilelog/connectionpool.py @@ -5,7 +5,6 @@ # 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 from mercurial import ( hg, diff --git a/hgext/remotefilelog/constants.py b/hgext/remotefilelog/constants.py --- a/hgext/remotefilelog/constants.py +++ b/hgext/remotefilelog/constants.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import struct from mercurial.i18n import _ diff --git a/hgext/remotefilelog/contentstore.py b/hgext/remotefilelog/contentstore.py --- a/hgext/remotefilelog/contentstore.py +++ b/hgext/remotefilelog/contentstore.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import threading from mercurial.node import ( diff --git a/hgext/remotefilelog/datapack.py b/hgext/remotefilelog/datapack.py --- a/hgext/remotefilelog/datapack.py +++ b/hgext/remotefilelog/datapack.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import struct import zlib diff --git a/hgext/remotefilelog/debugcommands.py b/hgext/remotefilelog/debugcommands.py --- a/hgext/remotefilelog/debugcommands.py +++ b/hgext/remotefilelog/debugcommands.py @@ -4,7 +4,6 @@ # # 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 os import zlib diff --git a/hgext/remotefilelog/fileserverclient.py b/hgext/remotefilelog/fileserverclient.py --- a/hgext/remotefilelog/fileserverclient.py +++ b/hgext/remotefilelog/fileserverclient.py @@ -5,7 +5,6 @@ # 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 io import os diff --git a/hgext/remotefilelog/historypack.py b/hgext/remotefilelog/historypack.py --- a/hgext/remotefilelog/historypack.py +++ b/hgext/remotefilelog/historypack.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import struct from mercurial.node import ( diff --git a/hgext/remotefilelog/metadatastore.py b/hgext/remotefilelog/metadatastore.py --- a/hgext/remotefilelog/metadatastore.py +++ b/hgext/remotefilelog/metadatastore.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from mercurial.node import ( hex, sha1nodeconstants, diff --git a/hgext/remotefilelog/remotefilectx.py b/hgext/remotefilelog/remotefilectx.py --- a/hgext/remotefilelog/remotefilectx.py +++ b/hgext/remotefilelog/remotefilectx.py @@ -4,7 +4,6 @@ # # 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 collections import time diff --git a/hgext/remotefilelog/remotefilelog.py b/hgext/remotefilelog/remotefilelog.py --- a/hgext/remotefilelog/remotefilelog.py +++ b/hgext/remotefilelog/remotefilelog.py @@ -5,7 +5,6 @@ # # 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 collections import os diff --git a/hgext/remotefilelog/remotefilelogserver.py b/hgext/remotefilelog/remotefilelogserver.py --- a/hgext/remotefilelog/remotefilelogserver.py +++ b/hgext/remotefilelog/remotefilelogserver.py @@ -4,7 +4,6 @@ # # 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 errno import os diff --git a/hgext/remotefilelog/repack.py b/hgext/remotefilelog/repack.py --- a/hgext/remotefilelog/repack.py +++ b/hgext/remotefilelog/repack.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import os import time diff --git a/hgext/remotefilelog/shallowbundle.py b/hgext/remotefilelog/shallowbundle.py --- a/hgext/remotefilelog/shallowbundle.py +++ b/hgext/remotefilelog/shallowbundle.py @@ -4,7 +4,6 @@ # # 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 from mercurial.i18n import _ from mercurial.node import bin, hex diff --git a/hgext/remotefilelog/shallowrepo.py b/hgext/remotefilelog/shallowrepo.py --- a/hgext/remotefilelog/shallowrepo.py +++ b/hgext/remotefilelog/shallowrepo.py @@ -4,7 +4,6 @@ # # 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 os diff --git a/hgext/remotefilelog/shallowstore.py b/hgext/remotefilelog/shallowstore.py --- a/hgext/remotefilelog/shallowstore.py +++ b/hgext/remotefilelog/shallowstore.py @@ -4,7 +4,6 @@ # # 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 def wrapstore(store): diff --git a/hgext/remotefilelog/shallowutil.py b/hgext/remotefilelog/shallowutil.py --- a/hgext/remotefilelog/shallowutil.py +++ b/hgext/remotefilelog/shallowutil.py @@ -4,7 +4,6 @@ # # 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 collections import errno diff --git a/hgext/remotefilelog/shallowverifier.py b/hgext/remotefilelog/shallowverifier.py --- a/hgext/remotefilelog/shallowverifier.py +++ b/hgext/remotefilelog/shallowverifier.py @@ -4,7 +4,6 @@ # # 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 from mercurial.i18n import _ from mercurial import verify diff --git a/hgext/remotenames.py b/hgext/remotenames.py --- a/hgext/remotenames.py +++ b/hgext/remotenames.py @@ -24,7 +24,6 @@ namespace (default: 'default') """ -from __future__ import absolute_import from mercurial.i18n import _ diff --git a/hgext/schemes.py b/hgext/schemes.py --- a/hgext/schemes.py +++ b/hgext/schemes.py @@ -39,7 +39,6 @@ You can override a predefined scheme by defining a new scheme with the same name. """ -from __future__ import absolute_import import os import re diff --git a/hgext/share.py b/hgext/share.py --- a/hgext/share.py +++ b/hgext/share.py @@ -65,7 +65,6 @@ and there are no untracked files, delete that share and create a new share. ''' -from __future__ import absolute_import import errno from mercurial.i18n import _ diff --git a/hgext/show.py b/hgext/show.py --- a/hgext/show.py +++ b/hgext/show.py @@ -25,7 +25,6 @@ performed. """ -from __future__ import absolute_import from mercurial.i18n import _ from mercurial.node import nullrev diff --git a/hgext/sparse.py b/hgext/sparse.py --- a/hgext/sparse.py +++ b/hgext/sparse.py @@ -71,7 +71,6 @@ tools/tests/** """ -from __future__ import absolute_import from mercurial.i18n import _ from mercurial.pycompat import setattr diff --git a/hgext/split.py b/hgext/split.py --- a/hgext/split.py +++ b/hgext/split.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. """command to split a changeset into smaller ones (EXPERIMENTAL)""" -from __future__ import absolute_import from mercurial.i18n import _ diff --git a/hgext/sqlitestore.py b/hgext/sqlitestore.py --- a/hgext/sqlitestore.py +++ b/hgext/sqlitestore.py @@ -43,7 +43,6 @@ # --extra-config-opt extensions.sqlitestore= \ # --extra-config-opt storage.new-repo-backend=sqlite -from __future__ import absolute_import import sqlite3 import struct diff --git a/hgext/strip.py b/hgext/strip.py --- a/hgext/strip.py +++ b/hgext/strip.py @@ -6,7 +6,6 @@ This extension allows you to strip changesets and all their descendants from the repository. See the command help for details. """ -from __future__ import absolute_import from mercurial import commands diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -13,7 +13,6 @@ Transplanted patches are recorded in .hg/transplant/transplants, as a map from a changeset hash to its hash in the source repository. ''' -from __future__ import absolute_import import os diff --git a/hgext/uncommit.py b/hgext/uncommit.py --- a/hgext/uncommit.py +++ b/hgext/uncommit.py @@ -17,7 +17,6 @@ added and removed in the working directory. """ -from __future__ import absolute_import from mercurial.i18n import _ diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py --- a/hgext/win32mbcs.py +++ b/hgext/win32mbcs.py @@ -44,7 +44,6 @@ It is useful for the users who want to commit with UTF-8 log message. ''' -from __future__ import absolute_import import os import sys diff --git a/hgext/win32text.py b/hgext/win32text.py --- a/hgext/win32text.py +++ b/hgext/win32text.py @@ -41,7 +41,6 @@ # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr ''' -from __future__ import absolute_import import re from mercurial.i18n import _ diff --git a/hgext/zeroconf/Zeroconf.py b/hgext/zeroconf/Zeroconf.py --- a/hgext/zeroconf/Zeroconf.py +++ b/hgext/zeroconf/Zeroconf.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - """ Multicast DNS Service Discovery for Python, v0.12 Copyright (C) 2003, Paul Scott-Murphy diff --git a/hgext/zeroconf/__init__.py b/hgext/zeroconf/__init__.py --- a/hgext/zeroconf/__init__.py +++ b/hgext/zeroconf/__init__.py @@ -22,7 +22,6 @@ $ hg paths zc-test = http://example.com:8000/test ''' -from __future__ import absolute_import import os import socket diff --git a/hgext3rd/__init__.py b/hgext3rd/__init__.py --- a/hgext3rd/__init__.py +++ b/hgext3rd/__init__.py @@ -1,5 +1,4 @@ # name space package to host third party extensions -from __future__ import absolute_import import pkgutil __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/i18n/check-translation.py b/i18n/check-translation.py --- a/i18n/check-translation.py +++ b/i18n/check-translation.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # # check-translation.py - check Mercurial specific translation problems -from __future__ import absolute_import import re diff --git a/i18n/hggettext b/i18n/hggettext --- a/i18n/hggettext +++ b/i18n/hggettext @@ -20,7 +20,6 @@ join the message cataloges to get the final catalog. """ -from __future__ import absolute_import, print_function import inspect import os diff --git a/i18n/polib.py b/i18n/polib.py --- a/i18n/polib.py +++ b/i18n/polib.py @@ -13,7 +13,6 @@ :func:`~polib.mofile` convenience functions. """ -from __future__ import absolute_import __author__ = 'David Jean Louis ' __version__ = '1.0.7' diff --git a/i18n/posplit b/i18n/posplit --- a/i18n/posplit +++ b/i18n/posplit @@ -5,7 +5,6 @@ # license: MIT/X11/Expat # -from __future__ import absolute_import, print_function import polib import re diff --git a/mercurial/__init__.py b/mercurial/__init__.py --- a/mercurial/__init__.py +++ b/mercurial/__init__.py @@ -5,7 +5,6 @@ # 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 # Allow 'from mercurial import demandimport' to keep working. import hgdemandimport diff --git a/mercurial/ancestor.py b/mercurial/ancestor.py --- a/mercurial/ancestor.py +++ b/mercurial/ancestor.py @@ -5,7 +5,6 @@ # 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 heapq diff --git a/mercurial/archival.py b/mercurial/archival.py --- a/mercurial/archival.py +++ b/mercurial/archival.py @@ -5,7 +5,6 @@ # 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 gzip import os diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -5,7 +5,6 @@ # 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 errno import struct diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -5,7 +5,6 @@ # 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 struct diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -145,7 +145,6 @@ preserve. """ -from __future__ import absolute_import, division import collections import errno diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py --- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -11,7 +11,6 @@ were part of the actual repository. """ -from __future__ import absolute_import import os import shutil diff --git a/mercurial/cacheutil.py b/mercurial/cacheutil.py --- a/mercurial/cacheutil.py +++ b/mercurial/cacheutil.py @@ -4,7 +4,6 @@ # # 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 from . import repoview diff --git a/mercurial/cffi/bdiff.py b/mercurial/cffi/bdiff.py --- a/mercurial/cffi/bdiff.py +++ b/mercurial/cffi/bdiff.py @@ -5,7 +5,6 @@ # 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 struct diff --git a/mercurial/cffi/bdiffbuild.py b/mercurial/cffi/bdiffbuild.py --- a/mercurial/cffi/bdiffbuild.py +++ b/mercurial/cffi/bdiffbuild.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import cffi import os diff --git a/mercurial/cffi/mpatch.py b/mercurial/cffi/mpatch.py --- a/mercurial/cffi/mpatch.py +++ b/mercurial/cffi/mpatch.py @@ -5,7 +5,6 @@ # 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 from ..pure.mpatch import * from ..pure.mpatch import mpatchError # silence pyflakes diff --git a/mercurial/cffi/mpatchbuild.py b/mercurial/cffi/mpatchbuild.py --- a/mercurial/cffi/mpatchbuild.py +++ b/mercurial/cffi/mpatchbuild.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import cffi import os diff --git a/mercurial/cffi/osutil.py b/mercurial/cffi/osutil.py --- a/mercurial/cffi/osutil.py +++ b/mercurial/cffi/osutil.py @@ -5,7 +5,6 @@ # 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 os import stat as statmod diff --git a/mercurial/cffi/osutilbuild.py b/mercurial/cffi/osutilbuild.py --- a/mercurial/cffi/osutilbuild.py +++ b/mercurial/cffi/osutilbuild.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import cffi ffi = cffi.FFI() diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -5,7 +5,6 @@ # 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 os import struct diff --git a/mercurial/changelog.py b/mercurial/changelog.py --- a/mercurial/changelog.py +++ b/mercurial/changelog.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from .node import ( diff --git a/mercurial/chgserver.py b/mercurial/chgserver.py --- a/mercurial/chgserver.py +++ b/mercurial/chgserver.py @@ -39,7 +39,6 @@ skiphash = False """ -from __future__ import absolute_import import inspect import os diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -5,7 +5,6 @@ # 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 copy as copymod import errno diff --git a/mercurial/color.py b/mercurial/color.py --- a/mercurial/color.py +++ b/mercurial/color.py @@ -5,7 +5,6 @@ # 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 re diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -5,7 +5,6 @@ # 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 errno import os diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py --- a/mercurial/commandserver.py +++ b/mercurial/commandserver.py @@ -5,7 +5,6 @@ # 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 errno import gc diff --git a/mercurial/commit.py b/mercurial/commit.py --- a/mercurial/commit.py +++ b/mercurial/commit.py @@ -3,7 +3,6 @@ # 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 errno diff --git a/mercurial/config.py b/mercurial/config.py --- a/mercurial/config.py +++ b/mercurial/config.py @@ -5,7 +5,6 @@ # 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 errno import os diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -5,7 +5,6 @@ # 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 functools import re diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -5,7 +5,6 @@ # 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 errno import filecmp diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -6,7 +6,6 @@ # 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 collections import os diff --git a/mercurial/crecord.py b/mercurial/crecord.py --- a/mercurial/crecord.py +++ b/mercurial/crecord.py @@ -8,7 +8,6 @@ # This code is based on the Mark Edgington's crecord extension. # (Itself based on Bryan O'Sullivan's record extension.) -from __future__ import absolute_import import os import re diff --git a/mercurial/dagop.py b/mercurial/dagop.py --- a/mercurial/dagop.py +++ b/mercurial/dagop.py @@ -5,7 +5,6 @@ # 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 heapq diff --git a/mercurial/dagparser.py b/mercurial/dagparser.py --- a/mercurial/dagparser.py +++ b/mercurial/dagparser.py @@ -5,7 +5,6 @@ # 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 re import string diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -5,7 +5,6 @@ # 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 binascii import codecs diff --git a/mercurial/destutil.py b/mercurial/destutil.py --- a/mercurial/destutil.py +++ b/mercurial/destutil.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from . import bookmarks, error, obsutil, scmutil, stack diff --git a/mercurial/diffhelper.py b/mercurial/diffhelper.py --- a/mercurial/diffhelper.py +++ b/mercurial/diffhelper.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ diff --git a/mercurial/diffutil.py b/mercurial/diffutil.py --- a/mercurial/diffutil.py +++ b/mercurial/diffutil.py @@ -7,7 +7,6 @@ # 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 from .i18n import _ diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -5,7 +5,6 @@ # 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 collections import contextlib diff --git a/mercurial/dirstateguard.py b/mercurial/dirstateguard.py --- a/mercurial/dirstateguard.py +++ b/mercurial/dirstateguard.py @@ -5,7 +5,6 @@ # 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 os from .i18n import _ diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -3,7 +3,6 @@ # 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 errno diff --git a/mercurial/dirstateutils/docket.py b/mercurial/dirstateutils/docket.py --- a/mercurial/dirstateutils/docket.py +++ b/mercurial/dirstateutils/docket.py @@ -5,7 +5,6 @@ # 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 struct diff --git a/mercurial/dirstateutils/timestamp.py b/mercurial/dirstateutils/timestamp.py --- a/mercurial/dirstateutils/timestamp.py +++ b/mercurial/dirstateutils/timestamp.py @@ -3,7 +3,6 @@ # 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 functools import os diff --git a/mercurial/dirstateutils/v2.py b/mercurial/dirstateutils/v2.py --- a/mercurial/dirstateutils/v2.py +++ b/mercurial/dirstateutils/v2.py @@ -5,7 +5,6 @@ # 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 struct diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -5,7 +5,6 @@ # 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 functools diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -5,7 +5,6 @@ # 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, print_function import errno import getopt diff --git a/mercurial/encoding.py b/mercurial/encoding.py --- a/mercurial/encoding.py +++ b/mercurial/encoding.py @@ -5,7 +5,6 @@ # 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, print_function import locale import os diff --git a/mercurial/error.py b/mercurial/error.py --- a/mercurial/error.py +++ b/mercurial/error.py @@ -11,7 +11,6 @@ imports. """ -from __future__ import absolute_import import difflib diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -5,7 +5,6 @@ # 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 collections import weakref diff --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -5,7 +5,6 @@ # 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 ast import collections diff --git a/mercurial/exthelper.py b/mercurial/exthelper.py --- a/mercurial/exthelper.py +++ b/mercurial/exthelper.py @@ -9,7 +9,6 @@ ### Extension helper ### ##################################################################### -from __future__ import absolute_import from . import ( commands, diff --git a/mercurial/fancyopts.py b/mercurial/fancyopts.py --- a/mercurial/fancyopts.py +++ b/mercurial/fancyopts.py @@ -5,7 +5,6 @@ # 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 abc import functools diff --git a/mercurial/filelog.py b/mercurial/filelog.py --- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from .node import nullrev diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -5,7 +5,6 @@ # 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 contextlib import os diff --git a/mercurial/fileset.py b/mercurial/fileset.py --- a/mercurial/fileset.py +++ b/mercurial/fileset.py @@ -5,7 +5,6 @@ # 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 errno import re diff --git a/mercurial/filesetlang.py b/mercurial/filesetlang.py --- a/mercurial/filesetlang.py +++ b/mercurial/filesetlang.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from .pycompat import getattr diff --git a/mercurial/formatter.py b/mercurial/formatter.py --- a/mercurial/formatter.py +++ b/mercurial/formatter.py @@ -105,7 +105,6 @@ baz: foo, bar """ -from __future__ import absolute_import, print_function import contextlib import itertools diff --git a/mercurial/graphmod.py b/mercurial/graphmod.py --- a/mercurial/graphmod.py +++ b/mercurial/graphmod.py @@ -17,7 +17,6 @@ Data depends on type. """ -from __future__ import absolute_import from .node import nullrev from .thirdparty import attr diff --git a/mercurial/grep.py b/mercurial/grep.py --- a/mercurial/grep.py +++ b/mercurial/grep.py @@ -5,7 +5,6 @@ # 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 difflib import errno diff --git a/mercurial/hbisect.py b/mercurial/hbisect.py --- a/mercurial/hbisect.py +++ b/mercurial/hbisect.py @@ -8,7 +8,6 @@ # 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 collections import contextlib diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -5,7 +5,6 @@ # 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 itertools import re diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -6,7 +6,6 @@ # 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 errno import os diff --git a/mercurial/hgweb/__init__.py b/mercurial/hgweb/__init__.py --- a/mercurial/hgweb/__init__.py +++ b/mercurial/hgweb/__init__.py @@ -6,7 +6,6 @@ # 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 os diff --git a/mercurial/hgweb/common.py b/mercurial/hgweb/common.py --- a/mercurial/hgweb/common.py +++ b/mercurial/hgweb/common.py @@ -6,7 +6,6 @@ # 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 base64 import errno diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -6,7 +6,6 @@ # 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 contextlib import os diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -6,7 +6,6 @@ # 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 gc import os diff --git a/mercurial/hgweb/request.py b/mercurial/hgweb/request.py --- a/mercurial/hgweb/request.py +++ b/mercurial/hgweb/request.py @@ -6,7 +6,6 @@ # 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 wsgiref.validate diff --git a/mercurial/hgweb/server.py b/mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py +++ b/mercurial/hgweb/server.py @@ -6,7 +6,6 @@ # 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 errno import importlib diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py +++ b/mercurial/hgweb/webcommands.py @@ -5,7 +5,6 @@ # 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 copy import mimetypes diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py +++ b/mercurial/hgweb/webutil.py @@ -6,7 +6,6 @@ # 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 copy import difflib diff --git a/mercurial/hgweb/wsgicgi.py b/mercurial/hgweb/wsgicgi.py --- a/mercurial/hgweb/wsgicgi.py +++ b/mercurial/hgweb/wsgicgi.py @@ -8,7 +8,6 @@ # This was originally copied from the public domain code at # http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side -from __future__ import absolute_import import os diff --git a/mercurial/hgweb/wsgiheaders.py b/mercurial/hgweb/wsgiheaders.py --- a/mercurial/hgweb/wsgiheaders.py +++ b/mercurial/hgweb/wsgiheaders.py @@ -9,7 +9,6 @@ # Regular expression that matches `special' characters in parameters, the # existence of which force quoting of the parameter value. -from __future__ import absolute_import, print_function import re diff --git a/mercurial/hook.py b/mercurial/hook.py --- a/mercurial/hook.py +++ b/mercurial/hook.py @@ -5,7 +5,6 @@ # 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 contextlib import errno diff --git a/mercurial/httpconnection.py b/mercurial/httpconnection.py --- a/mercurial/httpconnection.py +++ b/mercurial/httpconnection.py @@ -8,7 +8,6 @@ # 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 os diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py --- a/mercurial/httppeer.py +++ b/mercurial/httppeer.py @@ -6,7 +6,6 @@ # 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 errno import io diff --git a/mercurial/i18n.py b/mercurial/i18n.py --- a/mercurial/i18n.py +++ b/mercurial/i18n.py @@ -5,7 +5,6 @@ # 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 gettext as gettextmod import locale diff --git a/mercurial/interfaces/dirstate.py b/mercurial/interfaces/dirstate.py --- a/mercurial/interfaces/dirstate.py +++ b/mercurial/interfaces/dirstate.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import contextlib from . import util as interfaceutil diff --git a/mercurial/interfaces/repository.py b/mercurial/interfaces/repository.py --- a/mercurial/interfaces/repository.py +++ b/mercurial/interfaces/repository.py @@ -6,7 +6,6 @@ # 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 from ..i18n import _ from .. import error diff --git a/mercurial/interfaces/util.py b/mercurial/interfaces/util.py --- a/mercurial/interfaces/util.py +++ b/mercurial/interfaces/util.py @@ -9,7 +9,6 @@ # bookkeeping for declaring interfaces. So, we use stubs for various # zope.interface primitives unless instructed otherwise. -from __future__ import absolute_import from .. import encoding diff --git a/mercurial/keepalive.py b/mercurial/keepalive.py --- a/mercurial/keepalive.py +++ b/mercurial/keepalive.py @@ -82,7 +82,6 @@ # $Id: keepalive.py,v 1.14 2006/04/04 21:00:32 mstenner Exp $ -from __future__ import absolute_import, print_function import collections import errno diff --git a/mercurial/linelog.py b/mercurial/linelog.py --- a/mercurial/linelog.py +++ b/mercurial/linelog.py @@ -18,7 +18,6 @@ deletion is performed on the file, a jump instruction is used to patch in a new body of annotate information. """ -from __future__ import absolute_import, print_function import abc import struct diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -6,7 +6,6 @@ # 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 errno import functools diff --git a/mercurial/lock.py b/mercurial/lock.py --- a/mercurial/lock.py +++ b/mercurial/lock.py @@ -5,7 +5,6 @@ # 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 contextlib import errno diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py --- a/mercurial/logcmdutil.py +++ b/mercurial/logcmdutil.py @@ -5,7 +5,6 @@ # 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 itertools import os diff --git a/mercurial/logexchange.py b/mercurial/logexchange.py --- a/mercurial/logexchange.py +++ b/mercurial/logexchange.py @@ -6,7 +6,6 @@ # 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 from .node import hex diff --git a/mercurial/loggingutil.py b/mercurial/loggingutil.py --- a/mercurial/loggingutil.py +++ b/mercurial/loggingutil.py @@ -6,7 +6,6 @@ # 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 errno diff --git a/mercurial/lsprof.py b/mercurial/lsprof.py --- a/mercurial/lsprof.py +++ b/mercurial/lsprof.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import _lsprof import sys diff --git a/mercurial/lsprofcalltree.py b/mercurial/lsprofcalltree.py --- a/mercurial/lsprofcalltree.py +++ b/mercurial/lsprofcalltree.py @@ -10,7 +10,6 @@ of the GNU General Public License, incorporated herein by reference. """ -from __future__ import absolute_import from . import pycompat diff --git a/mercurial/mail.py b/mercurial/mail.py --- a/mercurial/mail.py +++ b/mercurial/mail.py @@ -5,7 +5,6 @@ # 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 email import email.charset diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -5,7 +5,6 @@ # 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 heapq import itertools diff --git a/mercurial/match.py b/mercurial/match.py --- a/mercurial/match.py +++ b/mercurial/match.py @@ -5,7 +5,6 @@ # 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, print_function import bisect import copy diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -5,7 +5,6 @@ # 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 re import struct diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -5,7 +5,6 @@ # 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 collections import errno diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py --- a/mercurial/mergestate.py +++ b/mercurial/mergestate.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import collections import errno import shutil diff --git a/mercurial/mergeutil.py b/mercurial/mergeutil.py --- a/mercurial/mergeutil.py +++ b/mercurial/mergeutil.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ diff --git a/mercurial/metadata.py b/mercurial/metadata.py --- a/mercurial/metadata.py +++ b/mercurial/metadata.py @@ -6,7 +6,6 @@ # # 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, print_function import multiprocessing import struct diff --git a/mercurial/minifileset.py b/mercurial/minifileset.py --- a/mercurial/minifileset.py +++ b/mercurial/minifileset.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from . import ( diff --git a/mercurial/minirst.py b/mercurial/minirst.py --- a/mercurial/minirst.py +++ b/mercurial/minirst.py @@ -18,7 +18,6 @@ when adding support for new constructs. """ -from __future__ import absolute_import import re diff --git a/mercurial/namespaces.py b/mercurial/namespaces.py --- a/mercurial/namespaces.py +++ b/mercurial/namespaces.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from .i18n import _ from . import ( pycompat, diff --git a/mercurial/narrowspec.py b/mercurial/narrowspec.py --- a/mercurial/narrowspec.py +++ b/mercurial/narrowspec.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from .pycompat import getattr diff --git a/mercurial/node.py b/mercurial/node.py --- a/mercurial/node.py +++ b/mercurial/node.py @@ -5,7 +5,6 @@ # 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 binascii diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py --- a/mercurial/obsolete.py +++ b/mercurial/obsolete.py @@ -67,7 +67,6 @@ comment associated with each format for details. """ -from __future__ import absolute_import import errno import struct diff --git a/mercurial/obsutil.py b/mercurial/obsutil.py --- a/mercurial/obsutil.py +++ b/mercurial/obsutil.py @@ -5,7 +5,6 @@ # 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 re diff --git a/mercurial/parser.py b/mercurial/parser.py --- a/mercurial/parser.py +++ b/mercurial/parser.py @@ -16,7 +16,6 @@ # an action is a tree node name, a tree label, and an optional match # __call__(program) parses program into a labeled tree -from __future__ import absolute_import, print_function from .i18n import _ from . import ( diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -6,7 +6,6 @@ # 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, print_function import collections import contextlib diff --git a/mercurial/pathutil.py b/mercurial/pathutil.py --- a/mercurial/pathutil.py +++ b/mercurial/pathutil.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import contextlib import errno import os diff --git a/mercurial/phases.py b/mercurial/phases.py --- a/mercurial/phases.py +++ b/mercurial/phases.py @@ -100,7 +100,6 @@ """ -from __future__ import absolute_import import errno import struct diff --git a/mercurial/policy.py b/mercurial/policy.py --- a/mercurial/policy.py +++ b/mercurial/policy.py @@ -5,7 +5,6 @@ # 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 os import sys diff --git a/mercurial/posix.py b/mercurial/posix.py --- a/mercurial/posix.py +++ b/mercurial/posix.py @@ -5,7 +5,6 @@ # 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 errno import fcntl diff --git a/mercurial/profiling.py b/mercurial/profiling.py --- a/mercurial/profiling.py +++ b/mercurial/profiling.py @@ -5,7 +5,6 @@ # 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, print_function import contextlib diff --git a/mercurial/progress.py b/mercurial/progress.py --- a/mercurial/progress.py +++ b/mercurial/progress.py @@ -5,7 +5,6 @@ # 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 errno import threading diff --git a/mercurial/pure/base85.py b/mercurial/pure/base85.py --- a/mercurial/pure/base85.py +++ b/mercurial/pure/base85.py @@ -5,7 +5,6 @@ # 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 struct diff --git a/mercurial/pure/bdiff.py b/mercurial/pure/bdiff.py --- a/mercurial/pure/bdiff.py +++ b/mercurial/pure/bdiff.py @@ -5,7 +5,6 @@ # 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 difflib import re diff --git a/mercurial/pure/charencode.py b/mercurial/pure/charencode.py --- a/mercurial/pure/charencode.py +++ b/mercurial/pure/charencode.py @@ -5,7 +5,6 @@ # 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 array diff --git a/mercurial/pure/mpatch.py b/mercurial/pure/mpatch.py --- a/mercurial/pure/mpatch.py +++ b/mercurial/pure/mpatch.py @@ -5,7 +5,6 @@ # 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 io import struct diff --git a/mercurial/pure/osutil.py b/mercurial/pure/osutil.py --- a/mercurial/pure/osutil.py +++ b/mercurial/pure/osutil.py @@ -5,7 +5,6 @@ # 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, division import ctypes import ctypes.util diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -5,7 +5,6 @@ # 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 io import stat diff --git a/mercurial/pushkey.py b/mercurial/pushkey.py --- a/mercurial/pushkey.py +++ b/mercurial/pushkey.py @@ -5,7 +5,6 @@ # 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 from . import ( bookmarks, diff --git a/mercurial/pvec.py b/mercurial/pvec.py --- a/mercurial/pvec.py +++ b/mercurial/pvec.py @@ -48,7 +48,6 @@ different branches ''' -from __future__ import absolute_import from .node import nullrev from . import ( diff --git a/mercurial/pycompat.py b/mercurial/pycompat.py --- a/mercurial/pycompat.py +++ b/mercurial/pycompat.py @@ -8,7 +8,6 @@ This contains aliases to hide python version-specific details from the core. """ -from __future__ import absolute_import import builtins import codecs diff --git a/mercurial/rcutil.py b/mercurial/rcutil.py --- a/mercurial/rcutil.py +++ b/mercurial/rcutil.py @@ -5,7 +5,6 @@ # 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 os diff --git a/mercurial/registrar.py b/mercurial/registrar.py --- a/mercurial/registrar.py +++ b/mercurial/registrar.py @@ -5,7 +5,6 @@ # 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 from . import ( configitems, diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -6,7 +6,6 @@ # 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 errno diff --git a/mercurial/repocache.py b/mercurial/repocache.py --- a/mercurial/repocache.py +++ b/mercurial/repocache.py @@ -5,7 +5,6 @@ # 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 collections import gc diff --git a/mercurial/repoview.py b/mercurial/repoview.py --- a/mercurial/repoview.py +++ b/mercurial/repoview.py @@ -6,7 +6,6 @@ # 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 copy import weakref diff --git a/mercurial/requirements.py b/mercurial/requirements.py --- a/mercurial/requirements.py +++ b/mercurial/requirements.py @@ -5,7 +5,6 @@ # 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 # obsolete experimental requirements: # - manifestv2: An experimental new manifest format that allowed diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -12,7 +12,6 @@ and O(changes) merge between branches. """ -from __future__ import absolute_import import binascii import collections diff --git a/mercurial/revlogutils/__init__.py b/mercurial/revlogutils/__init__.py --- a/mercurial/revlogutils/__init__.py +++ b/mercurial/revlogutils/__init__.py @@ -5,7 +5,6 @@ # 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 from ..thirdparty import attr from ..interfaces import repository diff --git a/mercurial/revlogutils/constants.py b/mercurial/revlogutils/constants.py --- a/mercurial/revlogutils/constants.py +++ b/mercurial/revlogutils/constants.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. """Helper class to compute deltas stored inside revlogs""" -from __future__ import absolute_import import struct diff --git a/mercurial/revlogutils/deltas.py b/mercurial/revlogutils/deltas.py --- a/mercurial/revlogutils/deltas.py +++ b/mercurial/revlogutils/deltas.py @@ -7,7 +7,6 @@ # GNU General Public License version 2 or any later version. """Helper class to compute deltas stored inside revlogs""" -from __future__ import absolute_import import collections import struct diff --git a/mercurial/revlogutils/docket.py b/mercurial/revlogutils/docket.py --- a/mercurial/revlogutils/docket.py +++ b/mercurial/revlogutils/docket.py @@ -15,7 +15,6 @@ # # * a data file, containing variable width data for these revisions, -from __future__ import absolute_import import errno import os diff --git a/mercurial/revlogutils/flagutil.py b/mercurial/revlogutils/flagutil.py --- a/mercurial/revlogutils/flagutil.py +++ b/mercurial/revlogutils/flagutil.py @@ -6,7 +6,6 @@ # 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 from ..i18n import _ diff --git a/mercurial/revlogutils/nodemap.py b/mercurial/revlogutils/nodemap.py --- a/mercurial/revlogutils/nodemap.py +++ b/mercurial/revlogutils/nodemap.py @@ -6,7 +6,6 @@ # 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 errno import re diff --git a/mercurial/revlogutils/revlogv0.py b/mercurial/revlogutils/revlogv0.py --- a/mercurial/revlogutils/revlogv0.py +++ b/mercurial/revlogutils/revlogv0.py @@ -4,7 +4,6 @@ # # 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 from ..node import sha1nodeconstants diff --git a/mercurial/revlogutils/sidedata.py b/mercurial/revlogutils/sidedata.py --- a/mercurial/revlogutils/sidedata.py +++ b/mercurial/revlogutils/sidedata.py @@ -30,7 +30,6 @@ the concept. """ -from __future__ import absolute_import import collections import struct diff --git a/mercurial/revset.py b/mercurial/revset.py --- a/mercurial/revset.py +++ b/mercurial/revset.py @@ -5,7 +5,6 @@ # 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 re diff --git a/mercurial/revsetlang.py b/mercurial/revsetlang.py --- a/mercurial/revsetlang.py +++ b/mercurial/revsetlang.py @@ -5,7 +5,6 @@ # 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 string diff --git a/mercurial/rewriteutil.py b/mercurial/rewriteutil.py --- a/mercurial/rewriteutil.py +++ b/mercurial/rewriteutil.py @@ -5,7 +5,6 @@ # 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 re diff --git a/mercurial/scmposix.py b/mercurial/scmposix.py --- a/mercurial/scmposix.py +++ b/mercurial/scmposix.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import array import errno import fcntl diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -5,7 +5,6 @@ # 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 errno import glob diff --git a/mercurial/scmwindows.py b/mercurial/scmwindows.py --- a/mercurial/scmwindows.py +++ b/mercurial/scmwindows.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import os from . import ( diff --git a/mercurial/server.py b/mercurial/server.py --- a/mercurial/server.py +++ b/mercurial/server.py @@ -5,7 +5,6 @@ # 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 os diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py --- a/mercurial/setdiscovery.py +++ b/mercurial/setdiscovery.py @@ -40,7 +40,6 @@ classified with it (since all ancestors or descendants will be marked as well). """ -from __future__ import absolute_import import collections import random diff --git a/mercurial/shelve.py b/mercurial/shelve.py --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -20,7 +20,6 @@ shelved change has a distinct name. For details, see the help for "hg shelve". """ -from __future__ import absolute_import import collections import errno diff --git a/mercurial/similar.py b/mercurial/similar.py --- a/mercurial/similar.py +++ b/mercurial/similar.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from . import ( diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -16,7 +16,6 @@ # mbp: "you know that thing where cvs gives you conflict markers?" # s: "i hate that." -from __future__ import absolute_import from .i18n import _ from . import ( diff --git a/mercurial/smartset.py b/mercurial/smartset.py --- a/mercurial/smartset.py +++ b/mercurial/smartset.py @@ -5,7 +5,6 @@ # 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 from .pycompat import getattr from . import ( diff --git a/mercurial/sparse.py b/mercurial/sparse.py --- a/mercurial/sparse.py +++ b/mercurial/sparse.py @@ -5,7 +5,6 @@ # 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 os diff --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py --- a/mercurial/sshpeer.py +++ b/mercurial/sshpeer.py @@ -5,7 +5,6 @@ # 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 re import uuid diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py --- a/mercurial/sslutil.py +++ b/mercurial/sslutil.py @@ -7,7 +7,6 @@ # 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 hashlib import os diff --git a/mercurial/stack.py b/mercurial/stack.py --- a/mercurial/stack.py +++ b/mercurial/stack.py @@ -5,8 +5,6 @@ # 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 - def getstack(repo, rev=None): """return a sorted smartrev of the stack containing either rev if it is diff --git a/mercurial/state.py b/mercurial/state.py --- a/mercurial/state.py +++ b/mercurial/state.py @@ -17,7 +17,6 @@ the data. """ -from __future__ import absolute_import import contextlib diff --git a/mercurial/statichttprepo.py b/mercurial/statichttprepo.py --- a/mercurial/statichttprepo.py +++ b/mercurial/statichttprepo.py @@ -7,7 +7,6 @@ # 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 errno diff --git a/mercurial/statprof.py b/mercurial/statprof.py --- a/mercurial/statprof.py +++ b/mercurial/statprof.py @@ -101,7 +101,6 @@ main thread's work patterns. """ # no-check-code -from __future__ import absolute_import, division, print_function import collections import contextlib diff --git a/mercurial/store.py b/mercurial/store.py --- a/mercurial/store.py +++ b/mercurial/store.py @@ -5,7 +5,6 @@ # 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 errno import functools diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py --- a/mercurial/streamclone.py +++ b/mercurial/streamclone.py @@ -5,7 +5,6 @@ # 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 contextlib import errno diff --git a/mercurial/strip.py b/mercurial/strip.py --- a/mercurial/strip.py +++ b/mercurial/strip.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from .i18n import _ from .pycompat import getattr from . import ( diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -5,7 +5,6 @@ # 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 copy import errno diff --git a/mercurial/subrepoutil.py b/mercurial/subrepoutil.py --- a/mercurial/subrepoutil.py +++ b/mercurial/subrepoutil.py @@ -5,7 +5,6 @@ # 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 errno import os diff --git a/mercurial/tagmerge.py b/mercurial/tagmerge.py --- a/mercurial/tagmerge.py +++ b/mercurial/tagmerge.py @@ -71,7 +71,6 @@ # - put blocks whose nodes come all from p2 first # - write the tag blocks in the sorted order -from __future__ import absolute_import from .i18n import _ from . import ( diff --git a/mercurial/tags.py b/mercurial/tags.py --- a/mercurial/tags.py +++ b/mercurial/tags.py @@ -10,7 +10,6 @@ # Eventually, it could take care of updating (adding/removing/moving) # tags too. -from __future__ import absolute_import import errno import io diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py --- a/mercurial/templatefilters.py +++ b/mercurial/templatefilters.py @@ -5,7 +5,6 @@ # 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 os import re diff --git a/mercurial/templatefuncs.py b/mercurial/templatefuncs.py --- a/mercurial/templatefuncs.py +++ b/mercurial/templatefuncs.py @@ -5,7 +5,6 @@ # 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 re diff --git a/mercurial/templatekw.py b/mercurial/templatekw.py --- a/mercurial/templatekw.py +++ b/mercurial/templatekw.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from .node import ( diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -65,7 +65,6 @@ operation. """ -from __future__ import absolute_import, print_function import abc import os diff --git a/mercurial/templateutil.py b/mercurial/templateutil.py --- a/mercurial/templateutil.py +++ b/mercurial/templateutil.py @@ -5,7 +5,6 @@ # 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 abc import types diff --git a/mercurial/testing/__init__.py b/mercurial/testing/__init__.py --- a/mercurial/testing/__init__.py +++ b/mercurial/testing/__init__.py @@ -1,8 +1,3 @@ -from __future__ import ( - absolute_import, - division, -) - import os import time diff --git a/mercurial/testing/revlog.py b/mercurial/testing/revlog.py --- a/mercurial/testing/revlog.py +++ b/mercurial/testing/revlog.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import unittest # picked from test-parse-index2, copied rather than imported diff --git a/mercurial/testing/storage.py b/mercurial/testing/storage.py --- a/mercurial/testing/storage.py +++ b/mercurial/testing/storage.py @@ -5,7 +5,6 @@ # 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 unittest diff --git a/mercurial/transaction.py b/mercurial/transaction.py --- a/mercurial/transaction.py +++ b/mercurial/transaction.py @@ -11,7 +11,6 @@ # 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 errno diff --git a/mercurial/treediscovery.py b/mercurial/treediscovery.py --- a/mercurial/treediscovery.py +++ b/mercurial/treediscovery.py @@ -5,7 +5,6 @@ # 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 collections diff --git a/mercurial/txnutil.py b/mercurial/txnutil.py --- a/mercurial/txnutil.py +++ b/mercurial/txnutil.py @@ -5,7 +5,6 @@ # 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 errno diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -5,7 +5,6 @@ # 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 collections import contextlib diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py --- a/mercurial/unionrepo.py +++ b/mercurial/unionrepo.py @@ -11,7 +11,6 @@ allowing operations like diff and log with revsets. """ -from __future__ import absolute_import from .i18n import _ from .pycompat import getattr diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py --- a/mercurial/upgrade.py +++ b/mercurial/upgrade.py @@ -5,7 +5,6 @@ # 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 from .i18n import _ from . import ( diff --git a/mercurial/upgrade_utils/actions.py b/mercurial/upgrade_utils/actions.py --- a/mercurial/upgrade_utils/actions.py +++ b/mercurial/upgrade_utils/actions.py @@ -5,7 +5,6 @@ # 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 from ..i18n import _ from .. import ( diff --git a/mercurial/upgrade_utils/engine.py b/mercurial/upgrade_utils/engine.py --- a/mercurial/upgrade_utils/engine.py +++ b/mercurial/upgrade_utils/engine.py @@ -5,7 +5,6 @@ # 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 errno import stat diff --git a/mercurial/url.py b/mercurial/url.py --- a/mercurial/url.py +++ b/mercurial/url.py @@ -7,7 +7,6 @@ # 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 base64 import socket diff --git a/mercurial/urllibcompat.py b/mercurial/urllibcompat.py --- a/mercurial/urllibcompat.py +++ b/mercurial/urllibcompat.py @@ -4,7 +4,6 @@ # # 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 from .pycompat import getattr from . import pycompat diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -13,7 +13,6 @@ hide platform-specific details from the core. """ -from __future__ import absolute_import, print_function import abc import collections diff --git a/mercurial/utils/cborutil.py b/mercurial/utils/cborutil.py --- a/mercurial/utils/cborutil.py +++ b/mercurial/utils/cborutil.py @@ -5,7 +5,6 @@ # 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 struct import sys diff --git a/mercurial/utils/compression.py b/mercurial/utils/compression.py --- a/mercurial/utils/compression.py +++ b/mercurial/utils/compression.py @@ -4,8 +4,6 @@ # GNU General Public License version 2 or any later version. -from __future__ import absolute_import, print_function - import bz2 import collections import zlib diff --git a/mercurial/utils/dateutil.py b/mercurial/utils/dateutil.py --- a/mercurial/utils/dateutil.py +++ b/mercurial/utils/dateutil.py @@ -5,7 +5,6 @@ # 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, print_function import calendar import datetime diff --git a/mercurial/utils/hashutil.py b/mercurial/utils/hashutil.py --- a/mercurial/utils/hashutil.py +++ b/mercurial/utils/hashutil.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import hashlib try: diff --git a/mercurial/utils/procutil.py b/mercurial/utils/procutil.py --- a/mercurial/utils/procutil.py +++ b/mercurial/utils/procutil.py @@ -7,7 +7,6 @@ # 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 contextlib import errno diff --git a/mercurial/utils/repoviewutil.py b/mercurial/utils/repoviewutil.py --- a/mercurial/utils/repoviewutil.py +++ b/mercurial/utils/repoviewutil.py @@ -6,7 +6,6 @@ # 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 ### Nearest subset relation # Nearest subset of filter X is a filter Y so that: diff --git a/mercurial/utils/resourceutil.py b/mercurial/utils/resourceutil.py --- a/mercurial/utils/resourceutil.py +++ b/mercurial/utils/resourceutil.py @@ -7,7 +7,6 @@ # 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 imp import os diff --git a/mercurial/utils/storageutil.py b/mercurial/utils/storageutil.py --- a/mercurial/utils/storageutil.py +++ b/mercurial/utils/storageutil.py @@ -5,7 +5,6 @@ # 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 re import struct diff --git a/mercurial/utils/stringutil.py b/mercurial/utils/stringutil.py --- a/mercurial/utils/stringutil.py +++ b/mercurial/utils/stringutil.py @@ -7,7 +7,6 @@ # 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 ast import codecs diff --git a/mercurial/verify.py b/mercurial/verify.py --- a/mercurial/verify.py +++ b/mercurial/verify.py @@ -5,7 +5,6 @@ # 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 os diff --git a/mercurial/vfs.py b/mercurial/vfs.py --- a/mercurial/vfs.py +++ b/mercurial/vfs.py @@ -4,7 +4,6 @@ # # 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 contextlib import errno diff --git a/mercurial/win32.py b/mercurial/win32.py --- a/mercurial/win32.py +++ b/mercurial/win32.py @@ -5,7 +5,6 @@ # 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 ctypes import ctypes.wintypes as wintypes diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -5,7 +5,6 @@ # 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 errno import getpass diff --git a/mercurial/wireprotoframing.py b/mercurial/wireprotoframing.py --- a/mercurial/wireprotoframing.py +++ b/mercurial/wireprotoframing.py @@ -9,7 +9,6 @@ # protocol. For details about the protocol, see # `hg help internals.wireprotocol`. -from __future__ import absolute_import import collections import struct diff --git a/mercurial/wireprotoserver.py b/mercurial/wireprotoserver.py --- a/mercurial/wireprotoserver.py +++ b/mercurial/wireprotoserver.py @@ -4,7 +4,6 @@ # 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 contextlib import struct diff --git a/mercurial/wireprototypes.py b/mercurial/wireprototypes.py --- a/mercurial/wireprototypes.py +++ b/mercurial/wireprototypes.py @@ -3,7 +3,6 @@ # 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 from .node import ( bin, diff --git a/mercurial/wireprotov1peer.py b/mercurial/wireprotov1peer.py --- a/mercurial/wireprotov1peer.py +++ b/mercurial/wireprotov1peer.py @@ -5,7 +5,6 @@ # 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 sys import weakref diff --git a/mercurial/wireprotov1server.py b/mercurial/wireprotov1server.py --- a/mercurial/wireprotov1server.py +++ b/mercurial/wireprotov1server.py @@ -5,7 +5,6 @@ # 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 binascii import os diff --git a/mercurial/worker.py b/mercurial/worker.py --- a/mercurial/worker.py +++ b/mercurial/worker.py @@ -5,7 +5,6 @@ # 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 errno import os diff --git a/tests/artifacts/scripts/generate-churning-bundle.py b/tests/artifacts/scripts/generate-churning-bundle.py --- a/tests/artifacts/scripts/generate-churning-bundle.py +++ b/tests/artifacts/scripts/generate-churning-bundle.py @@ -17,7 +17,6 @@ # # Running with `chg` in your path and `CHGHG` set is recommended for speed. -from __future__ import absolute_import, print_function import hashlib import os diff --git a/tests/autodiff.py b/tests/autodiff.py --- a/tests/autodiff.py +++ b/tests/autodiff.py @@ -1,6 +1,5 @@ # Extension dedicated to test patch.diff() upgrade modes -from __future__ import absolute_import from mercurial import ( error, diff --git a/tests/basic_test_result.py b/tests/basic_test_result.py --- a/tests/basic_test_result.py +++ b/tests/basic_test_result.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import sys import unittest diff --git a/tests/blackbox-readonly-dispatch.py b/tests/blackbox-readonly-dispatch.py --- a/tests/blackbox-readonly-dispatch.py +++ b/tests/blackbox-readonly-dispatch.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os from mercurial import ( dispatch, diff --git a/tests/bruterebase.py b/tests/bruterebase.py --- a/tests/bruterebase.py +++ b/tests/bruterebase.py @@ -5,7 +5,6 @@ # 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 from mercurial import ( error, diff --git a/tests/check-perf-code.py b/tests/check-perf-code.py --- a/tests/check-perf-code.py +++ b/tests/check-perf-code.py @@ -2,7 +2,6 @@ # # check-perf-code - (historical) portability checker for contrib/perf.py -from __future__ import absolute_import import os import sys diff --git a/tests/common-pattern.py b/tests/common-pattern.py --- a/tests/common-pattern.py +++ b/tests/common-pattern.py @@ -1,5 +1,4 @@ # common patterns in test at can safely be replaced -from __future__ import absolute_import import os diff --git a/tests/crashgetbundler.py b/tests/crashgetbundler.py --- a/tests/crashgetbundler.py +++ b/tests/crashgetbundler.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from mercurial.i18n import _ from mercurial import changegroup, error, extensions diff --git a/tests/drawdag.py b/tests/drawdag.py --- a/tests/drawdag.py +++ b/tests/drawdag.py @@ -80,7 +80,6 @@ # split: A -> B, C # 1 to many # prune: A, B, C # many to nothing """ -from __future__ import absolute_import, print_function import collections import itertools diff --git a/tests/dumbhttp.py b/tests/dumbhttp.py --- a/tests/dumbhttp.py +++ b/tests/dumbhttp.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import absolute_import """ Small and dumb HTTP server for use in tests. diff --git a/tests/dummysmtpd.py b/tests/dummysmtpd.py --- a/tests/dummysmtpd.py +++ b/tests/dummysmtpd.py @@ -2,7 +2,6 @@ """dummy SMTP server for use in tests""" -from __future__ import absolute_import import asyncore import optparse diff --git a/tests/dummyssh b/tests/dummyssh --- a/tests/dummyssh +++ b/tests/dummyssh @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import absolute_import import os import shlex diff --git a/tests/f b/tests/f --- a/tests/f +++ b/tests/f @@ -23,7 +23,6 @@ md5sum.py """ -from __future__ import absolute_import import binascii import glob diff --git a/tests/failfilemerge.py b/tests/failfilemerge.py --- a/tests/failfilemerge.py +++ b/tests/failfilemerge.py @@ -1,6 +1,5 @@ # extension to emulate interrupting filemerge._filemerge -from __future__ import absolute_import from mercurial import ( error, diff --git a/tests/fakedirstatewritetime.py b/tests/fakedirstatewritetime.py --- a/tests/fakedirstatewritetime.py +++ b/tests/fakedirstatewritetime.py @@ -5,7 +5,6 @@ # - 'workingctx._poststatusfixup()' (= 'repo.status()') # - 'committablectx.markcommitted()' -from __future__ import absolute_import from mercurial import ( context, diff --git a/tests/fakemergerecord.py b/tests/fakemergerecord.py --- a/tests/fakemergerecord.py +++ b/tests/fakemergerecord.py @@ -2,7 +2,6 @@ # # -from __future__ import absolute_import from mercurial import ( mergestate as mergestatemod, diff --git a/tests/fakepatchtime.py b/tests/fakepatchtime.py --- a/tests/fakepatchtime.py +++ b/tests/fakepatchtime.py @@ -1,7 +1,6 @@ # extension to emulate invoking 'patch.internalpatch()' at the time # specified by '[fakepatchtime] fakenow' -from __future__ import absolute_import from mercurial import ( extensions, diff --git a/tests/filterpyflakes.py b/tests/filterpyflakes.py --- a/tests/filterpyflakes.py +++ b/tests/filterpyflakes.py @@ -2,7 +2,6 @@ # Filter output by pyflakes to control which warnings we check -from __future__ import absolute_import, print_function import re import sys diff --git a/tests/filtertraceback.py b/tests/filtertraceback.py --- a/tests/filtertraceback.py +++ b/tests/filtertraceback.py @@ -2,7 +2,6 @@ # Filters traceback lines from stdin. -from __future__ import absolute_import, print_function import io import sys diff --git a/tests/flagprocessorext.py b/tests/flagprocessorext.py --- a/tests/flagprocessorext.py +++ b/tests/flagprocessorext.py @@ -1,6 +1,5 @@ # coding=UTF-8 -from __future__ import absolute_import import base64 import zlib diff --git a/tests/fsmonitor-run-tests.py b/tests/fsmonitor-run-tests.py --- a/tests/fsmonitor-run-tests.py +++ b/tests/fsmonitor-run-tests.py @@ -11,8 +11,6 @@ # Watchman and runs the Mercurial tests against it. This ensures that the global # version of Watchman isn't affected by anything this test does. -from __future__ import absolute_import -from __future__ import print_function import argparse import contextlib diff --git a/tests/generate-working-copy-states.py b/tests/generate-working-copy-states.py --- a/tests/generate-working-copy-states.py +++ b/tests/generate-working-copy-states.py @@ -29,7 +29,6 @@ # $ hg forget *_*_*-untracked # $ rm *_*_missing-* -from __future__ import absolute_import, print_function import os import sys diff --git a/tests/get-with-headers.py b/tests/get-with-headers.py --- a/tests/get-with-headers.py +++ b/tests/get-with-headers.py @@ -3,7 +3,6 @@ """This does HTTP GET requests given a host:port and path and returns a subset of the headers plus the body of the result.""" -from __future__ import absolute_import import argparse import json diff --git a/tests/heredoctest.py b/tests/heredoctest.py --- a/tests/heredoctest.py +++ b/tests/heredoctest.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import sys diff --git a/tests/hghave b/tests/hghave --- a/tests/hghave +++ b/tests/hghave @@ -4,7 +4,6 @@ prefixed with "no-", the absence of feature is tested. """ -from __future__ import absolute_import, print_function import hghave import optparse diff --git a/tests/hghave.py b/tests/hghave.py --- a/tests/hghave.py +++ b/tests/hghave.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import distutils.version import os import re diff --git a/tests/hgweberror.py b/tests/hgweberror.py --- a/tests/hgweberror.py +++ b/tests/hgweberror.py @@ -1,6 +1,5 @@ # A dummy extension that installs an hgweb command that throws an Exception. -from __future__ import absolute_import from mercurial.hgweb import webcommands diff --git a/tests/httpserverauth.py b/tests/httpserverauth.py --- a/tests/httpserverauth.py +++ b/tests/httpserverauth.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import base64 import hashlib diff --git a/tests/hypothesishelpers.py b/tests/hypothesishelpers.py --- a/tests/hypothesishelpers.py +++ b/tests/hypothesishelpers.py @@ -4,7 +4,6 @@ # # For details see http://hypothesis.readthedocs.org -from __future__ import absolute_import, print_function import os import sys import traceback diff --git a/tests/killdaemons.py b/tests/killdaemons.py --- a/tests/killdaemons.py +++ b/tests/killdaemons.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import absolute_import import errno import os import signal diff --git a/tests/list-tree.py b/tests/list-tree.py --- a/tests/list-tree.py +++ b/tests/list-tree.py @@ -1,8 +1,3 @@ -from __future__ import ( - absolute_import, - print_function, -) - import argparse import os diff --git a/tests/lockdelay.py b/tests/lockdelay.py --- a/tests/lockdelay.py +++ b/tests/lockdelay.py @@ -2,7 +2,6 @@ # # This extension can be used to test race conditions between lock acquisition. -from __future__ import absolute_import import os import time diff --git a/tests/logexceptions.py b/tests/logexceptions.py --- a/tests/logexceptions.py +++ b/tests/logexceptions.py @@ -5,7 +5,6 @@ # 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 inspect import os diff --git a/tests/ls-l.py b/tests/ls-l.py --- a/tests/ls-l.py +++ b/tests/ls-l.py @@ -2,7 +2,6 @@ # like ls -l, but do not print date, user, or non-common mode bit, to avoid # using globs in tests. -from __future__ import absolute_import, print_function import os import stat diff --git a/tests/md5sum.py b/tests/md5sum.py --- a/tests/md5sum.py +++ b/tests/md5sum.py @@ -6,7 +6,6 @@ # of the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2, which is # GPL-compatible. -from __future__ import absolute_import import hashlib import os diff --git a/tests/mockblackbox.py b/tests/mockblackbox.py --- a/tests/mockblackbox.py +++ b/tests/mockblackbox.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from mercurial.utils import procutil # XXX: we should probably offer a devel option to do this in blackbox directly diff --git a/tests/mockmakedate.py b/tests/mockmakedate.py --- a/tests/mockmakedate.py +++ b/tests/mockmakedate.py @@ -1,6 +1,5 @@ # mock out util.makedate() to supply testable values -from __future__ import absolute_import import os diff --git a/tests/mocktime.py b/tests/mocktime.py --- a/tests/mocktime.py +++ b/tests/mocktime.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import os import time diff --git a/tests/printenv.py b/tests/printenv.py --- a/tests/printenv.py +++ b/tests/printenv.py @@ -12,7 +12,6 @@ # - [output] is the name of the output file (default: use sys.stdout) # the file will be opened in append mode. # -from __future__ import absolute_import import argparse import os import sys diff --git a/tests/printrevset.py b/tests/printrevset.py --- a/tests/printrevset.py +++ b/tests/printrevset.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from mercurial.thirdparty import attr from mercurial import ( cmdutil, diff --git a/tests/pullext.py b/tests/pullext.py --- a/tests/pullext.py +++ b/tests/pullext.py @@ -5,7 +5,6 @@ # 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 from mercurial.i18n import _ from mercurial import ( diff --git a/tests/readlink.py b/tests/readlink.py --- a/tests/readlink.py +++ b/tests/readlink.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import absolute_import, print_function import errno import os diff --git a/tests/remotefilelog-getflogheads.py b/tests/remotefilelog-getflogheads.py --- a/tests/remotefilelog-getflogheads.py +++ b/tests/remotefilelog-getflogheads.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from mercurial.i18n import _ from mercurial import ( hg, diff --git a/tests/revlog-formatv0.py b/tests/revlog-formatv0.py --- a/tests/revlog-formatv0.py +++ b/tests/revlog-formatv0.py @@ -17,7 +17,6 @@ empty file """ -from __future__ import absolute_import import binascii import os import sys diff --git a/tests/revnamesext.py b/tests/revnamesext.py --- a/tests/revnamesext.py +++ b/tests/revnamesext.py @@ -1,6 +1,5 @@ # Dummy extension to define a namespace containing revision names -from __future__ import absolute_import from mercurial import namespaces diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -43,8 +43,6 @@ # completes fairly quickly, includes both shell and Python scripts, and # includes some scripts that run daemon processes.) -from __future__ import absolute_import, print_function - import argparse import collections diff --git a/tests/seq.py b/tests/seq.py --- a/tests/seq.py +++ b/tests/seq.py @@ -7,7 +7,6 @@ # seq START STOP [START, STOP] stepping by 1 # seq START STEP STOP [START, STOP] stepping by STEP -from __future__ import absolute_import, print_function import os import sys diff --git a/tests/silenttestrunner.py b/tests/silenttestrunner.py --- a/tests/silenttestrunner.py +++ b/tests/silenttestrunner.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os import sys import unittest diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py --- a/tests/simplestorerepo.py +++ b/tests/simplestorerepo.py @@ -10,7 +10,6 @@ # $ HGREPOFEATURES="simplestore" ./run-tests.py \ # --extra-config-opt extensions.simplestore=`pwd`/simplestorerepo.py -from __future__ import absolute_import import stat diff --git a/tests/sitecustomize.py b/tests/sitecustomize.py --- a/tests/sitecustomize.py +++ b/tests/sitecustomize.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os if os.environ.get('COVERAGE_PROCESS_START'): diff --git a/tests/sshprotoext.py b/tests/sshprotoext.py --- a/tests/sshprotoext.py +++ b/tests/sshprotoext.py @@ -8,7 +8,6 @@ # This extension replaces the SSH server started via `hg serve --stdio`. # The server behaves differently depending on environment variables. -from __future__ import absolute_import from mercurial import ( error, diff --git a/tests/svn-safe-append.py b/tests/svn-safe-append.py --- a/tests/svn-safe-append.py +++ b/tests/svn-safe-append.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import absolute_import __doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b. Without this svn will not detect workspace changes.""" diff --git a/tests/svnurlof.py b/tests/svnurlof.py --- a/tests/svnurlof.py +++ b/tests/svnurlof.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import sys from mercurial import ( diff --git a/tests/svnxml.py b/tests/svnxml.py --- a/tests/svnxml.py +++ b/tests/svnxml.py @@ -1,7 +1,6 @@ # Read the output of a "svn log --xml" command on stdin, parse it and # print a subset of attributes common to all svn versions tested by # hg. -from __future__ import absolute_import import sys import xml.dom.minidom diff --git a/tests/test-absorb-filefixupstate.py b/tests/test-absorb-filefixupstate.py --- a/tests/test-absorb-filefixupstate.py +++ b/tests/test-absorb-filefixupstate.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import itertools from mercurial import pycompat from hgext import absorb diff --git a/tests/test-ancestor.py b/tests/test-ancestor.py --- a/tests/test-ancestor.py +++ b/tests/test-ancestor.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import binascii import getopt import math diff --git a/tests/test-annotate.py b/tests/test-annotate.py --- a/tests/test-annotate.py +++ b/tests/test-annotate.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import print_function - import unittest from mercurial import ( diff --git a/tests/test-atomictempfile.py b/tests/test-atomictempfile.py --- a/tests/test-atomictempfile.py +++ b/tests/test-atomictempfile.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import glob import os import shutil diff --git a/tests/test-batching.py b/tests/test-batching.py --- a/tests/test-batching.py +++ b/tests/test-batching.py @@ -5,7 +5,6 @@ # 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, print_function import contextlib diff --git a/tests/test-bdiff.py b/tests/test-bdiff.py --- a/tests/test-bdiff.py +++ b/tests/test-bdiff.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import collections import struct import unittest diff --git a/tests/test-cappedreader.py b/tests/test-cappedreader.py --- a/tests/test-cappedreader.py +++ b/tests/test-cappedreader.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import io import unittest diff --git a/tests/test-cbor.py b/tests/test-cbor.py --- a/tests/test-cbor.py +++ b/tests/test-cbor.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import os import sys import unittest diff --git a/tests/test-check-interfaces.py b/tests/test-check-interfaces.py --- a/tests/test-check-interfaces.py +++ b/tests/test-check-interfaces.py @@ -1,6 +1,5 @@ # Test that certain objects conform to well-defined interfaces. -from __future__ import absolute_import, print_function from mercurial import encoding diff --git a/tests/test-config-env.py b/tests/test-config-env.py --- a/tests/test-config-env.py +++ b/tests/test-config-env.py @@ -1,6 +1,5 @@ # Test the config layer generated by environment variables -from __future__ import absolute_import, print_function import os diff --git a/tests/test-context.py b/tests/test-context.py --- a/tests/test-context.py +++ b/tests/test-context.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os import stat import sys diff --git a/tests/test-demandimport.py b/tests/test-demandimport.py --- a/tests/test-demandimport.py +++ b/tests/test-demandimport.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - from mercurial import demandimport demandimport.enable() diff --git a/tests/test-dirs.py b/tests/test-dirs.py --- a/tests/test-dirs.py +++ b/tests/test-dirs.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import unittest import silenttestrunner diff --git a/tests/test-dispatch.py b/tests/test-dispatch.py --- a/tests/test-dispatch.py +++ b/tests/test-dispatch.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os import sys from mercurial import dispatch diff --git a/tests/test-doctest.py b/tests/test-doctest.py --- a/tests/test-doctest.py +++ b/tests/test-doctest.py @@ -1,7 +1,5 @@ # this is hack to make sure no escape characters are inserted into the output -from __future__ import absolute_import -from __future__ import print_function import doctest import os diff --git a/tests/test-duplicateoptions.py b/tests/test-duplicateoptions.py --- a/tests/test-duplicateoptions.py +++ b/tests/test-duplicateoptions.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os from mercurial import ( commands, diff --git a/tests/test-encoding-func.py b/tests/test-encoding-func.py --- a/tests/test-encoding-func.py +++ b/tests/test-encoding-func.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import unittest from mercurial import encoding diff --git a/tests/test-extensions-wrapfunction.py b/tests/test-extensions-wrapfunction.py --- a/tests/test-extensions-wrapfunction.py +++ b/tests/test-extensions-wrapfunction.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - from mercurial import extensions diff --git a/tests/test-fastannotate-revmap.py b/tests/test-fastannotate-revmap.py --- a/tests/test-fastannotate-revmap.py +++ b/tests/test-fastannotate-revmap.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import os import tempfile diff --git a/tests/test-filecache.py b/tests/test-filecache.py --- a/tests/test-filecache.py +++ b/tests/test-filecache.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os import stat import subprocess diff --git a/tests/test-filelog.py b/tests/test-filelog.py --- a/tests/test-filelog.py +++ b/tests/test-filelog.py @@ -2,7 +2,6 @@ """ Tests the behavior of filelog w.r.t. data starting with '\1\n' """ -from __future__ import absolute_import, print_function from mercurial.node import hex from mercurial import ( diff --git a/tests/test-hashutil.py b/tests/test-hashutil.py --- a/tests/test-hashutil.py +++ b/tests/test-hashutil.py @@ -1,6 +1,5 @@ # Tests to ensure that sha1dc.sha1 is exactly a drop-in for # hashlib.sha1 for our needs. -from __future__ import absolute_import import hashlib import unittest diff --git a/tests/test-hg-parseurl.py b/tests/test-hg-parseurl.py --- a/tests/test-hg-parseurl.py +++ b/tests/test-hg-parseurl.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import unittest from mercurial.utils import urlutil diff --git a/tests/test-hgweb-auth.py b/tests/test-hgweb-auth.py --- a/tests/test-hgweb-auth.py +++ b/tests/test-hgweb-auth.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - from mercurial import demandimport demandimport.enable() diff --git a/tests/test-hgwebdir-gc.py b/tests/test-hgwebdir-gc.py --- a/tests/test-hgwebdir-gc.py +++ b/tests/test-hgwebdir-gc.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import os from mercurial.hgweb import hgwebdir_mod diff --git a/tests/test-hgwebdir-paths.py b/tests/test-hgwebdir-paths.py --- a/tests/test-hgwebdir-paths.py +++ b/tests/test-hgwebdir-paths.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import os from mercurial import ( hg, diff --git a/tests/test-hybridencode.py b/tests/test-hybridencode.py --- a/tests/test-hybridencode.py +++ b/tests/test-hybridencode.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import unittest from mercurial import store diff --git a/tests/test-lfs-pointer.py b/tests/test-lfs-pointer.py --- a/tests/test-lfs-pointer.py +++ b/tests/test-lfs-pointer.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - # Import something from Mercurial, so the module loader gets initialized. from mercurial import pycompat diff --git a/tests/test-linelog.py b/tests/test-linelog.py --- a/tests/test-linelog.py +++ b/tests/test-linelog.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import difflib import random import unittest diff --git a/tests/test-linerange.py b/tests/test-linerange.py --- a/tests/test-linerange.py +++ b/tests/test-linerange.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import unittest from mercurial import error, mdiff from mercurial.utils import stringutil diff --git a/tests/test-lock.py b/tests/test-lock.py --- a/tests/test-lock.py +++ b/tests/test-lock.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import copy import errno import tempfile diff --git a/tests/test-lrucachedict.py b/tests/test-lrucachedict.py --- a/tests/test-lrucachedict.py +++ b/tests/test-lrucachedict.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import unittest import silenttestrunner diff --git a/tests/test-manifest.py b/tests/test-manifest.py --- a/tests/test-manifest.py +++ b/tests/test-manifest.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import binascii import itertools import silenttestrunner diff --git a/tests/test-match.py b/tests/test-match.py --- a/tests/test-match.py +++ b/tests/test-match.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import unittest import silenttestrunner diff --git a/tests/test-mdiff.py b/tests/test-mdiff.py --- a/tests/test-mdiff.py +++ b/tests/test-mdiff.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import print_function - import unittest from mercurial import mdiff diff --git a/tests/test-minifileset.py b/tests/test-minifileset.py --- a/tests/test-minifileset.py +++ b/tests/test-minifileset.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import print_function - from mercurial import minifileset diff --git a/tests/test-minirst.py b/tests/test-minirst.py --- a/tests/test-minirst.py +++ b/tests/test-minirst.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function from mercurial import minirst from mercurial.utils import stringutil diff --git a/tests/test-parseindex2.py b/tests/test-parseindex2.py --- a/tests/test-parseindex2.py +++ b/tests/test-parseindex2.py @@ -3,7 +3,6 @@ It also checks certain aspects of the parsers module as a whole. """ -from __future__ import absolute_import, print_function import os import struct diff --git a/tests/test-pathencode.py b/tests/test-pathencode.py --- a/tests/test-pathencode.py +++ b/tests/test-pathencode.py @@ -5,7 +5,6 @@ # that have proven likely to expose bugs and divergent behavior in # different encoding implementations. -from __future__ import absolute_import, print_function import binascii import collections diff --git a/tests/test-propertycache.py b/tests/test-propertycache.py --- a/tests/test-propertycache.py +++ b/tests/test-propertycache.py @@ -4,7 +4,6 @@ property cache of both localrepo and repoview to prevent regression.""" -from __future__ import absolute_import, print_function import os import subprocess diff --git a/tests/test-remotefilelog-datapack.py b/tests/test-remotefilelog-datapack.py --- a/tests/test-remotefilelog-datapack.py +++ b/tests/test-remotefilelog-datapack.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import, print_function import hashlib import os diff --git a/tests/test-remotefilelog-histpack.py b/tests/test-remotefilelog-histpack.py --- a/tests/test-remotefilelog-histpack.py +++ b/tests/test-remotefilelog-histpack.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import import hashlib import os diff --git a/tests/test-revlog-ancestry.py b/tests/test-revlog-ancestry.py --- a/tests/test-revlog-ancestry.py +++ b/tests/test-revlog-ancestry.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os from mercurial import ( hg, diff --git a/tests/test-revlog-raw.py b/tests/test-revlog-raw.py --- a/tests/test-revlog-raw.py +++ b/tests/test-revlog-raw.py @@ -1,6 +1,5 @@ # test revlog interaction about raw data (flagprocessor) -from __future__ import absolute_import, print_function import collections import hashlib diff --git a/tests/test-run-tests.py b/tests/test-run-tests.py --- a/tests/test-run-tests.py +++ b/tests/test-run-tests.py @@ -3,7 +3,6 @@ run-test.t only checks positive matches and can not see warnings (both by design) """ -from __future__ import absolute_import, print_function import doctest import os diff --git a/tests/test-rust-ancestor.py b/tests/test-rust-ancestor.py --- a/tests/test-rust-ancestor.py +++ b/tests/test-rust-ancestor.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import sys import unittest diff --git a/tests/test-rust-discovery.py b/tests/test-rust-discovery.py --- a/tests/test-rust-discovery.py +++ b/tests/test-rust-discovery.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import unittest from mercurial import policy diff --git a/tests/test-rust-revlog.py b/tests/test-rust-revlog.py --- a/tests/test-rust-revlog.py +++ b/tests/test-rust-revlog.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import unittest try: diff --git a/tests/test-simplekeyvaluefile.py b/tests/test-simplekeyvaluefile.py --- a/tests/test-simplekeyvaluefile.py +++ b/tests/test-simplekeyvaluefile.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import unittest import silenttestrunner diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py --- a/tests/test-simplemerge.py +++ b/tests/test-simplemerge.py @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -from __future__ import absolute_import import unittest from mercurial import ( diff --git a/tests/test-sshserver.py b/tests/test-sshserver.py --- a/tests/test-sshserver.py +++ b/tests/test-sshserver.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import io import unittest diff --git a/tests/test-status-inprocess.py b/tests/test-status-inprocess.py --- a/tests/test-status-inprocess.py +++ b/tests/test-status-inprocess.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import, print_function import sys diff --git a/tests/test-stdio.py b/tests/test-stdio.py --- a/tests/test-stdio.py +++ b/tests/test-stdio.py @@ -2,7 +2,6 @@ """ Tests the buffering behavior of stdio streams in `mercurial.utils.procutil`. """ -from __future__ import absolute_import import contextlib import errno diff --git a/tests/test-storage.py b/tests/test-storage.py --- a/tests/test-storage.py +++ b/tests/test-storage.py @@ -1,6 +1,5 @@ # This test verifies the conformance of various classes to various # storage interfaces. -from __future__ import absolute_import import silenttestrunner diff --git a/tests/test-symlink-os-yes-fs-no.py b/tests/test-symlink-os-yes-fs-no.py --- a/tests/test-symlink-os-yes-fs-no.py +++ b/tests/test-symlink-os-yes-fs-no.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import os import sys import time diff --git a/tests/test-trusted.py b/tests/test-trusted.py --- a/tests/test-trusted.py +++ b/tests/test-trusted.py @@ -2,7 +2,6 @@ # with files from different users/groups, we cheat a bit by # monkey-patching some functions in the util module -from __future__ import absolute_import, print_function import os import sys diff --git a/tests/test-ui-color.py b/tests/test-ui-color.py --- a/tests/test-ui-color.py +++ b/tests/test-ui-color.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import os from mercurial import ( dispatch, diff --git a/tests/test-ui-config.py b/tests/test-ui-config.py --- a/tests/test-ui-config.py +++ b/tests/test-ui-config.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function from mercurial import ( dispatch, error, diff --git a/tests/test-ui-verbosity.py b/tests/test-ui-verbosity.py --- a/tests/test-ui-verbosity.py +++ b/tests/test-ui-verbosity.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import os from mercurial import ( pycompat, diff --git a/tests/test-url.py b/tests/test-url.py --- a/tests/test-url.py +++ b/tests/test-url.py @@ -1,5 +1,4 @@ # coding=utf-8 -from __future__ import absolute_import, print_function import doctest import os diff --git a/tests/test-util.py b/tests/test-util.py --- a/tests/test-util.py +++ b/tests/test-util.py @@ -1,5 +1,4 @@ # unit tests for mercuril.util utilities -from __future__ import absolute_import import contextlib import io diff --git a/tests/test-verify-repo-operations.py b/tests/test-verify-repo-operations.py --- a/tests/test-verify-repo-operations.py +++ b/tests/test-verify-repo-operations.py @@ -1,5 +1,3 @@ -from __future__ import print_function, absolute_import - """Fuzz testing for operations against a Mercurial repository This uses Hypothesis's stateful testing to generate random repository diff --git a/tests/test-walkrepo.py b/tests/test-walkrepo.py --- a/tests/test-walkrepo.py +++ b/tests/test-walkrepo.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import os from mercurial import ( diff --git a/tests/test-wireproto-clientreactor.py b/tests/test-wireproto-clientreactor.py --- a/tests/test-wireproto-clientreactor.py +++ b/tests/test-wireproto-clientreactor.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import sys import unittest import zlib diff --git a/tests/test-wireproto-framing.py b/tests/test-wireproto-framing.py --- a/tests/test-wireproto-framing.py +++ b/tests/test-wireproto-framing.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import unittest from mercurial import ( diff --git a/tests/test-wireproto-serverreactor.py b/tests/test-wireproto-serverreactor.py --- a/tests/test-wireproto-serverreactor.py +++ b/tests/test-wireproto-serverreactor.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import unittest from mercurial import ( diff --git a/tests/test-wireproto.py b/tests/test-wireproto.py --- a/tests/test-wireproto.py +++ b/tests/test-wireproto.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import sys from mercurial import ( diff --git a/tests/test-wsgirequest.py b/tests/test-wsgirequest.py --- a/tests/test-wsgirequest.py +++ b/tests/test-wsgirequest.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import unittest from mercurial.hgweb import request as requestmod diff --git a/tests/testlib/badserverext.py b/tests/testlib/badserverext.py --- a/tests/testlib/badserverext.py +++ b/tests/testlib/badserverext.py @@ -44,7 +44,6 @@ request) """ -from __future__ import absolute_import import re import socket diff --git a/tests/testlib/crash_transaction_late.py b/tests/testlib/crash_transaction_late.py --- a/tests/testlib/crash_transaction_late.py +++ b/tests/testlib/crash_transaction_late.py @@ -5,7 +5,6 @@ # 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 from mercurial import ( error, diff --git a/tests/testlib/ext-phase-report.py b/tests/testlib/ext-phase-report.py --- a/tests/testlib/ext-phase-report.py +++ b/tests/testlib/ext-phase-report.py @@ -1,7 +1,5 @@ # tiny extension to report phase changes during transaction -from __future__ import absolute_import - def reposetup(ui, repo): def reportphasemove(tr): diff --git a/tests/testlib/ext-sidedata-2.py b/tests/testlib/ext-sidedata-2.py --- a/tests/testlib/ext-sidedata-2.py +++ b/tests/testlib/ext-sidedata-2.py @@ -8,7 +8,6 @@ # 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 hashlib import struct diff --git a/tests/testlib/ext-sidedata-3.py b/tests/testlib/ext-sidedata-3.py --- a/tests/testlib/ext-sidedata-3.py +++ b/tests/testlib/ext-sidedata-3.py @@ -9,7 +9,6 @@ # 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 hashlib import struct diff --git a/tests/testlib/ext-sidedata-4.py b/tests/testlib/ext-sidedata-4.py --- a/tests/testlib/ext-sidedata-4.py +++ b/tests/testlib/ext-sidedata-4.py @@ -9,7 +9,6 @@ # 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 from mercurial.revlogutils import sidedata diff --git a/tests/testlib/ext-sidedata-5.py b/tests/testlib/ext-sidedata-5.py --- a/tests/testlib/ext-sidedata-5.py +++ b/tests/testlib/ext-sidedata-5.py @@ -9,7 +9,6 @@ # 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 hashlib import struct diff --git a/tests/testlib/ext-sidedata.py b/tests/testlib/ext-sidedata.py --- a/tests/testlib/ext-sidedata.py +++ b/tests/testlib/ext-sidedata.py @@ -5,7 +5,6 @@ # 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 hashlib import struct diff --git a/tests/testlib/ext-stream-clone-steps.py b/tests/testlib/ext-stream-clone-steps.py --- a/tests/testlib/ext-stream-clone-steps.py +++ b/tests/testlib/ext-stream-clone-steps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from mercurial import ( encoding, extensions, diff --git a/tests/testlib/persistent-nodemap-race-ext.py b/tests/testlib/persistent-nodemap-race-ext.py --- a/tests/testlib/persistent-nodemap-race-ext.py +++ b/tests/testlib/persistent-nodemap-race-ext.py @@ -35,7 +35,6 @@ /!\ valid. """ -from __future__ import print_function import os diff --git a/tests/testlib/sigpipe-remote.py b/tests/testlib/sigpipe-remote.py --- a/tests/testlib/sigpipe-remote.py +++ b/tests/testlib/sigpipe-remote.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -from __future__ import print_function import io import os diff --git a/tests/testlib/sigpipe-worker.py b/tests/testlib/sigpipe-worker.py --- a/tests/testlib/sigpipe-worker.py +++ b/tests/testlib/sigpipe-worker.py @@ -3,7 +3,6 @@ # This is literally `cat` but in python, one char at a time. # # see sigpipe-remote.py for details. -from __future__ import print_function import io import os diff --git a/tests/tinyproxy.py b/tests/tinyproxy.py --- a/tests/tinyproxy.py +++ b/tests/tinyproxy.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import absolute_import, print_function __doc__ = """Tiny HTTP Proxy. diff --git a/tests/unwrap-message-id.py b/tests/unwrap-message-id.py --- a/tests/unwrap-message-id.py +++ b/tests/unwrap-message-id.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import sys for line in sys.stdin: