This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10710

vfs: Fix deprecation warning in Python 3.10 (issue6520)
ClosedPublic

Authored by tir.karthi on May 14 2021, 6:11 AM.

Details

Reviewers
joerg.sonnenberger
Group Reviewers
hg-reviewers
Commits
rHG63286e0886a6: vfs: Fix deprecation warning in Python 3.10 (issue6520)

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

tir.karthi created this revision.May 14 2021, 6:11 AM
joerg.sonnenberger accepted this revision.May 14 2021, 7:14 AM
joerg.sonnenberger added a subscriber: joerg.sonnenberger.

Silly Python, but this should be fine for all versions we care about. Ironically, it used to be defined the other way around as alias...

tir.karthi added a commit: rHG63286e0886a6: vfs: Fix deprecation warning in Python 3.10 (issue6520).May 14 2021, 4:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG63286e0886a6: vfs: Fix deprecation warning in Python 3.10 (issue6520) (authored by tir.karthi). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/vfs.py (4 lines)

Diff 27917

mercurial/vfs.py

When this context manager is active, ``backgroundclose`` can be passed When this context manager is active, ``backgroundclose`` can be passed
to ``__call__``/``open`` to result in the file possibly being closed to ``__call__``/``open`` to result in the file possibly being closed
asynchronously, on a background thread. asynchronously, on a background thread.
""" """
# Sharing backgroundfilecloser between threads is complex and using # Sharing backgroundfilecloser between threads is complex and using
# multiple instances puts us at risk of running out of file descriptors # multiple instances puts us at risk of running out of file descriptors
# only allow to use backgroundfilecloser when in main thread. # only allow to use backgroundfilecloser when in main thread.
if not isinstance( if not isinstance(
threading.currentThread(), threading.current_thread(),
threading._MainThread, # pytype: disable=module-attr threading._MainThread, # pytype: disable=module-attr
): ):
yield yield
return return
vfs = getattr(self, 'vfs', self) vfs = getattr(self, 'vfs', self)
if getattr(vfs, '_backgroundfilecloser', None): if getattr(vfs, '_backgroundfilecloser', None):
raise error.Abort( raise error.Abort(
_(b'can only have 1 active background file closer') _(b'can only have 1 active background file closer')
b'implementation error: mode %s is not' b'implementation error: mode %s is not'
b' valid for checkambig=True' b' valid for checkambig=True'
) )
% mode % mode
) )
fp = checkambigatclosing(fp) fp = checkambigatclosing(fp)
if backgroundclose and isinstance( if backgroundclose and isinstance(
threading.currentThread(), threading.current_thread(),
threading._MainThread, # pytype: disable=module-attr threading._MainThread, # pytype: disable=module-attr
): ):
if ( if (
not self._backgroundfilecloser # pytype: disable=attribute-error not self._backgroundfilecloser # pytype: disable=attribute-error
): ):
raise error.Abort( raise error.Abort(
_( _(
b'backgroundclose can only be used when a ' b'backgroundclose can only be used when a '