diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -62,7 +62,6 @@ tests/test-manifest.py not using absolute_import tests/test-pathencode.py not using absolute_import tests/test-pathencode.py requires print_function - tests/test-propertycache.py requires print_function tests/test-revlog-ancestry.py not using absolute_import tests/test-revlog-ancestry.py requires print_function tests/test-run-tests.py not using absolute_import @@ -232,7 +231,6 @@ tests/readlink.py: invalid syntax: invalid syntax (, line *) (glob) tests/test-demandimport.py: invalid syntax: invalid syntax (, line *) (glob) tests/test-lrucachedict.py: invalid syntax: invalid syntax (, line *) (glob) - tests/test-propertycache.py: invalid syntax: Missing parentheses in call to 'print' (, line *) (glob) tests/test-revlog-ancestry.py: invalid syntax: Missing parentheses in call to 'print' (, line *) (glob) tests/test-status-inprocess.py: invalid syntax: Missing parentheses in call to 'print' (, line *) (glob) tests/test-trusted.py: invalid syntax: invalid syntax (, line *) (glob) 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,7 @@ The repoview overlay is quite complex. W property cache of both localrepo and repoview to prevent regression.""" -from __future__ import absolute_import +from __future__ import absolute_import, print_function import os import subprocess import mercurial.localrepo @@ -49,133 +49,133 @@ ui = uimod.ui() repo = mercurial.hg.repository(ui, path=repopath).unfiltered() -print '' -print '=== property cache ===' -print '' -print 'calllog:', calllog -print 'cached value (unfiltered):', -print vars(repo).get('testcachedfoobar', 'NOCACHE') +print('') +print('=== property cache ===') +print('') +print('calllog:', calllog) +print('cached value (unfiltered):', + vars(repo).get('testcachedfoobar', 'NOCACHE')) -print '' -print '= first access on unfiltered, should do a call' -print 'access:', repo.testcachedfoobar -print 'calllog:', calllog -print 'cached value (unfiltered):', -print vars(repo).get('testcachedfoobar', 'NOCACHE') +print('') +print('= first access on unfiltered, should do a call') +print('access:', repo.testcachedfoobar) +print('calllog:', calllog) +print('cached value (unfiltered):', + vars(repo).get('testcachedfoobar', 'NOCACHE')) -print '' -print '= second access on unfiltered, should not do call' -print 'access', repo.testcachedfoobar -print 'calllog:', calllog -print 'cached value (unfiltered):', -print vars(repo).get('testcachedfoobar', 'NOCACHE') +print('') +print('= second access on unfiltered, should not do call') +print('access', repo.testcachedfoobar) +print('calllog:', calllog) +print('cached value (unfiltered):', + vars(repo).get('testcachedfoobar', 'NOCACHE')) -print '' -print '= first access on "visible" view, should do a call' +print('') +print('= first access on "visible" view, should do a call') visibleview = repo.filtered('visible') -print 'cached value ("visible" view):', -print vars(visibleview).get('testcachedfoobar', 'NOCACHE') -print 'access:', visibleview.testcachedfoobar -print 'calllog:', calllog -print 'cached value (unfiltered):', -print vars(repo).get('testcachedfoobar', 'NOCACHE') -print 'cached value ("visible" view):', -print vars(visibleview).get('testcachedfoobar', 'NOCACHE') +print('cached value ("visible" view):', + vars(visibleview).get('testcachedfoobar', 'NOCACHE')) +print('access:', visibleview.testcachedfoobar) +print('calllog:', calllog) +print('cached value (unfiltered):', + vars(repo).get('testcachedfoobar', 'NOCACHE')) +print('cached value ("visible" view):', + vars(visibleview).get('testcachedfoobar', 'NOCACHE')) -print '' -print '= second access on "visible view", should not do call' -print 'access:', visibleview.testcachedfoobar -print 'calllog:', calllog -print 'cached value (unfiltered):', -print vars(repo).get('testcachedfoobar', 'NOCACHE') -print 'cached value ("visible" view):', -print vars(visibleview).get('testcachedfoobar', 'NOCACHE') +print('') +print('= second access on "visible view", should not do call') +print('access:', visibleview.testcachedfoobar) +print('calllog:', calllog) +print('cached value (unfiltered):', + vars(repo).get('testcachedfoobar', 'NOCACHE')) +print('cached value ("visible" view):', + vars(visibleview).get('testcachedfoobar', 'NOCACHE')) -print '' -print '= no effect on other view' +print('') +print('= no effect on other view') immutableview = repo.filtered('immutable') -print 'cached value ("immutable" view):', -print vars(immutableview).get('testcachedfoobar', 'NOCACHE') -print 'access:', immutableview.testcachedfoobar -print 'calllog:', calllog -print 'cached value (unfiltered):', -print vars(repo).get('testcachedfoobar', 'NOCACHE') -print 'cached value ("visible" view):', -print vars(visibleview).get('testcachedfoobar', 'NOCACHE') -print 'cached value ("immutable" view):', -print vars(immutableview).get('testcachedfoobar', 'NOCACHE') +print('cached value ("immutable" view):', + vars(immutableview).get('testcachedfoobar', 'NOCACHE')) +print('access:', immutableview.testcachedfoobar) +print('calllog:', calllog) +print('cached value (unfiltered):', + vars(repo).get('testcachedfoobar', 'NOCACHE')) +print('cached value ("visible" view):', + vars(visibleview).get('testcachedfoobar', 'NOCACHE')) +print('cached value ("immutable" view):', + vars(immutableview).get('testcachedfoobar', 'NOCACHE')) # unfiltered property cache test -print '' -print '' -print '=== unfiltered property cache ===' -print '' -print 'unficalllog:', unficalllog -print 'cached value (unfiltered): ', -print vars(repo).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("visible" view): ', -print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("immutable" view):', -print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') +print('') +print('') +print('=== unfiltered property cache ===') +print('') +print('unficalllog:', unficalllog) +print('cached value (unfiltered): ', + vars(repo).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("visible" view): ', + vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("immutable" view):', + vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) -print '' -print '= first access on unfiltered, should do a call' -print 'access (unfiltered):', repo.testcachedunfifoobar -print 'unficalllog:', unficalllog -print 'cached value (unfiltered): ', -print vars(repo).get('testcachedunfifoobar', 'NOCACHE') +print('') +print('= first access on unfiltered, should do a call') +print('access (unfiltered):', repo.testcachedunfifoobar) +print('unficalllog:', unficalllog) +print('cached value (unfiltered): ', + vars(repo).get('testcachedunfifoobar', 'NOCACHE')) -print '' -print '= second access on unfiltered, should not do call' -print 'access (unfiltered):', repo.testcachedunfifoobar -print 'unficalllog:', unficalllog -print 'cached value (unfiltered): ', -print vars(repo).get('testcachedunfifoobar', 'NOCACHE') +print('') +print('= second access on unfiltered, should not do call') +print('access (unfiltered):', repo.testcachedunfifoobar) +print('unficalllog:', unficalllog) +print('cached value (unfiltered): ', + vars(repo).get('testcachedunfifoobar', 'NOCACHE')) -print '' -print '= access on view should use the unfiltered cache' -print 'access (unfiltered): ', repo.testcachedunfifoobar -print 'access ("visible" view): ', visibleview.testcachedunfifoobar -print 'access ("immutable" view):', immutableview.testcachedunfifoobar -print 'unficalllog:', unficalllog -print 'cached value (unfiltered): ', -print vars(repo).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("visible" view): ', -print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("immutable" view):', -print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') +print('') +print('= access on view should use the unfiltered cache') +print('access (unfiltered): ', repo.testcachedunfifoobar) +print('access ("visible" view): ', visibleview.testcachedunfifoobar) +print('access ("immutable" view):', immutableview.testcachedunfifoobar) +print('unficalllog:', unficalllog) +print('cached value (unfiltered): ', + vars(repo).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("visible" view): ', + vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("immutable" view):', + vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) -print '' -print '= even if we clear the unfiltered cache' +print('') +print('= even if we clear the unfiltered cache') del repo.__dict__['testcachedunfifoobar'] -print 'cached value (unfiltered): ', -print vars(repo).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("visible" view): ', -print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("immutable" view):', -print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') -print 'unficalllog:', unficalllog -print 'access ("visible" view): ', visibleview.testcachedunfifoobar -print 'unficalllog:', unficalllog -print 'cached value (unfiltered): ', -print vars(repo).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("visible" view): ', -print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("immutable" view):', -print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') -print 'access ("immutable" view):', immutableview.testcachedunfifoobar -print 'unficalllog:', unficalllog -print 'cached value (unfiltered): ', -print vars(repo).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("visible" view): ', -print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("immutable" view):', -print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') -print 'access (unfiltered): ', repo.testcachedunfifoobar -print 'unficalllog:', unficalllog -print 'cached value (unfiltered): ', -print vars(repo).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("visible" view): ', -print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') -print 'cached value ("immutable" view):', -print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') +print('cached value (unfiltered): ', + vars(repo).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("visible" view): ', + vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("immutable" view):', + vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) +print('unficalllog:', unficalllog) +print('access ("visible" view): ', visibleview.testcachedunfifoobar) +print('unficalllog:', unficalllog) +print('cached value (unfiltered): ', + vars(repo).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("visible" view): ', + vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("immutable" view):', + vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) +print('access ("immutable" view):', immutableview.testcachedunfifoobar) +print('unficalllog:', unficalllog) +print('cached value (unfiltered): ', + vars(repo).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("visible" view): ', + vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("immutable" view):', + vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) +print('access (unfiltered): ', repo.testcachedunfifoobar) +print('unficalllog:', unficalllog) +print('cached value (unfiltered): ', + vars(repo).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("visible" view): ', + vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) +print('cached value ("immutable" view):', + vars(immutableview).get('testcachedunfifoobar', 'NOCACHE'))