Mercurial > hg

diff tests/test-merge1.t @ 48876:42d2b31cee0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove from __future__ from inline Python in tests This is no longer required since we require Python 3 and the linter no longer requires these statements. Differential Revision: https://phab.mercurial-scm.org/D12255
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 20 Feb 2022 15:28:44 -0700
parents 434de12918fd
children
line wrap: on
line diff
--- a/tests/test-merge1.t	Thu Mar 03 17:34:00 2022 +0100
+++ b/tests/test-merge1.t	Sun Feb 20 15:28:44 2022 -0700
@@ -1,5 +1,4 @@
   $ cat <<EOF > merge
-  > from __future__ import print_function
   > import sys, os
   > 
   > try:
@@ -354,7 +353,6 @@
 trigger it. If you see flakyness here, there is a race.
 
   $ cat > $TESTTMP/abort.py <<EOF
-  > from __future__ import absolute_import
   > # emulate aborting before "recordupdates()". in this case, files
   > # are changed without updating dirstate
   > from mercurial import (