This is an archive of the discontinued Mercurial Phabricator instance.

Differential D73

util: remove unused ctxmanager
ClosedPublic

Authored by martinvonz on Jul 13 2017, 1:12 PM.

Details

Reviewers
phillco
durham
durin42
Group Reviewers
hg-reviewers
Commits
rHG0e114b992e02: util: remove unused ctxmanager
Summary

This was meant as a substitute for Python's "with" with multiple
context managers before we moved to Python 2.7. We're now on 2.7, so
we should have no reason to keep ctxmanager. "hg grep --all
ctxmanager" says that it was never used anyway.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 13 2017, 1:12 PM
phillco accepted this revision.Jul 13 2017, 2:00 PM
durham accepted this revision.Jul 13 2017, 3:48 PM
durin42 accepted this revision.Jul 14 2017, 11:50 AM
This revision is now accepted and ready to land.Jul 14 2017, 11:50 AM
Closed by commit rHG0e114b992e02: util: remove unused ctxmanager (authored by martinvonz). · Explain WhyJul 14 2017, 1:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 137

contrib/python3-whitelist

test-ancestor.py test-ancestor.py
test-backwards-remove.t test-backwards-remove.t
test-branch-tag-confict.t test-branch-tag-confict.t
test-casecollision.t test-casecollision.t
test-check-commit.t test-check-commit.t
test-check-execute.t test-check-execute.t
test-check-pyflakes.t test-check-pyflakes.t
test-check-pylint.t test-check-pylint.t
test-check-shbang.t test-check-shbang.t
test-contrib-check-code.t test-contrib-check-code.t
test-contrib-check-commit.t test-contrib-check-commit.t
test-ctxmanager.py
test-diff-issue2761.t test-diff-issue2761.t
test-diff-newlines.t test-diff-newlines.t
test-diff-reverse.t test-diff-reverse.t
test-diff-subdir.t test-diff-subdir.t
test-dirstate-nonnormalset.t test-dirstate-nonnormalset.t
test-doctest.py test-doctest.py
test-empty-dir.t test-empty-dir.t
test-excessive-merge.t test-excessive-merge.t

mercurial/util.py

dirs = parsers.dirs dirs = parsers.dirs
def finddirs(path): def finddirs(path):
pos = path.rfind('/') pos = path.rfind('/')
while pos != -1: while pos != -1:
yield path[:pos] yield path[:pos]
pos = path.rfind('/', 0, pos) pos = path.rfind('/', 0, pos)
class ctxmanager(object):
'''A context manager for use in 'with' blocks to allow multiple
contexts to be entered at once. This is both safer and more
flexible than contextlib.nested.
Once Mercurial supports Python 2.7+, this will become mostly
unnecessary.
'''
def __init__(self, *args):
'''Accepts a list of no-argument functions that return context
managers. These will be invoked at __call__ time.'''
self._pending = args
self._atexit = []
def __enter__(self):
return self
def enter(self):
'''Create and enter context managers in the order in which they were
passed to the constructor.'''
values = []
for func in self._pending:
obj = func()
values.append(obj.__enter__())
self._atexit.append(obj.__exit__)
del self._pending
return values
def atexit(self, func, *args, **kwargs):
'''Add a function to call when this context manager exits. The
ordering of multiple atexit calls is unspecified, save that
they will happen before any __exit__ functions.'''
def wrapper(exc_type, exc_val, exc_tb):
func(*args, **kwargs)
self._atexit.append(wrapper)
return func
def __exit__(self, exc_type, exc_val, exc_tb):
'''Context managers are exited in the reverse order from which
they were created.'''
received = exc_type is not None
suppressed = False
pending = None
self._atexit.reverse()
for exitfunc in self._atexit:
try:
if exitfunc(exc_type, exc_val, exc_tb):
suppressed = True
exc_type = None
exc_val = None
exc_tb = None
except BaseException:
pending = sys.exc_info()
exc_type, exc_val, exc_tb = pending = sys.exc_info()
del self._atexit
if pending:
raise exc_val
return received and suppressed
# compression code # compression code
SERVERROLE = 'server' SERVERROLE = 'server'
CLIENTROLE = 'client' CLIENTROLE = 'client'
compewireprotosupport = collections.namedtuple(u'compenginewireprotosupport', compewireprotosupport = collections.namedtuple(u'compenginewireprotosupport',
(u'name', u'serverpriority', (u'name', u'serverpriority',
u'clientpriority')) u'clientpriority'))

tests/test-check-module-imports.t

> -X contrib/debugshell.py \ > -X contrib/debugshell.py \
> -X contrib/python-zstandard/ \ > -X contrib/python-zstandard/ \
> -X contrib/win32/hgwebdir_wsgi.py \ > -X contrib/win32/hgwebdir_wsgi.py \
> -X doc/gendoc.py \ > -X doc/gendoc.py \
> -X doc/hgmanpage.py \ > -X doc/hgmanpage.py \
> -X i18n/posplit \ > -X i18n/posplit \
> -X tests/test-hgweb-auth.py \ > -X tests/test-hgweb-auth.py \
> -X tests/hypothesishelpers.py \ > -X tests/hypothesishelpers.py \
> -X tests/test-ctxmanager.py \
> -X tests/test-lock.py \ > -X tests/test-lock.py \
> -X tests/test-verify-repo-operations.py \ > -X tests/test-verify-repo-operations.py \
> -X tests/test-hook.t \ > -X tests/test-hook.t \
> -X tests/test-import.t \ > -X tests/test-import.t \
> -X tests/test-imports-checker.t \ > -X tests/test-imports-checker.t \
> -X tests/test-commit-interactive.t \ > -X tests/test-commit-interactive.t \
> -X tests/test-contrib-check-code.t \ > -X tests/test-contrib-check-code.t \
> -X tests/test-extension.t \ > -X tests/test-extension.t \
> -X tests/test-hghave.t \ > -X tests/test-hghave.t \
> -X tests/test-hgweb-no-path-info.t \ > -X tests/test-hgweb-no-path-info.t \
> -X tests/test-hgweb-no-request-uri.t \ > -X tests/test-hgweb-no-request-uri.t \
> -X tests/test-hgweb-non-interactive.t \ > -X tests/test-hgweb-non-interactive.t \
> | sed 's-\\-/-g' | $PYTHON "$import_checker" - > | sed 's-\\-/-g' | $PYTHON "$import_checker" -

tests/test-ctxmanager.py

  • This file was deleted.
from __future__ import absolute_import
import silenttestrunner
import unittest
from mercurial import util
class contextmanager(object):
def __init__(self, name, trace):
self.name = name
self.entered = False
self.exited = False
self.trace = trace
def __enter__(self):
self.entered = True
self.trace(('enter', self.name))
return self
def __exit__(self, exc_type, exc_val, exc_tb):
self.exited = exc_type, exc_val, exc_tb
self.trace(('exit', self.name))
def __repr__(self):
return '<ctx %r>' % self.name
class ctxerror(Exception):
pass
class raise_on_enter(contextmanager):
def __enter__(self):
self.trace(('raise', self.name))
raise ctxerror(self.name)
class raise_on_exit(contextmanager):
def __exit__(self, exc_type, exc_val, exc_tb):
self.trace(('raise', self.name))
raise ctxerror(self.name)
def ctxmgr(name, trace):
return lambda: contextmanager(name, trace)
class test_ctxmanager(unittest.TestCase):
def test_basics(self):
trace = []
addtrace = trace.append
with util.ctxmanager(ctxmgr('a', addtrace), ctxmgr('b', addtrace)) as c:
a, b = c.enter()
c.atexit(addtrace, ('atexit', 'x'))
c.atexit(addtrace, ('atexit', 'y'))
self.assertEqual(trace, [('enter', 'a'), ('enter', 'b'),
('atexit', 'y'), ('atexit', 'x'),
('exit', 'b'), ('exit', 'a')])
def test_raise_on_enter(self):
trace = []
addtrace = trace.append
with self.assertRaises(ctxerror):
with util.ctxmanager(ctxmgr('a', addtrace),
lambda: raise_on_enter('b', addtrace)) as c:
c.enter()
addtrace('unreachable')
self.assertEqual(trace, [('enter', 'a'), ('raise', 'b'), ('exit', 'a')])
def test_raise_on_exit(self):
trace = []
addtrace = trace.append
with self.assertRaises(ctxerror):
with util.ctxmanager(ctxmgr('a', addtrace),
lambda: raise_on_exit('b', addtrace)) as c:
c.enter()
addtrace('running')
self.assertEqual(trace, [('enter', 'a'), ('enter', 'b'), 'running',
('raise', 'b'), ('exit', 'a')])
if __name__ == '__main__':
silenttestrunner.main(__name__)
mercurial/util.py