Mercurial > public > mercurial-scm > hg-stable
diff hgext/win32mbcs.py @ 43076:2372284d9457
formatting: blacken the codebase
This is using my patch to black
(https://github.com/psf/black/pull/826) so we don't un-wrap collection
literals.
Done with:
hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S
# skip-blame mass-reformatting only
# no-check-commit reformats foo_bar functions
Differential Revision: https://phab.mercurial-scm.org/D6971
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 06 Oct 2019 09:45:02 -0400 |
| parents | 79dd61a4554f |
| children | 687b865b95ad |
line wrap: on
line diff
--- a/hgext/win32mbcs.py Sat Oct 05 10:29:34 2019 -0400 +++ b/hgext/win32mbcs.py Sun Oct 06 09:45:02 2019 -0400 @@ -68,11 +68,12 @@ # Encoding.encoding may be updated by --encoding option. # Use a lambda do delay the resolution. -configitem('win32mbcs', 'encoding', - default=lambda: encoding.encoding, +configitem( + 'win32mbcs', 'encoding', default=lambda: encoding.encoding, ) -_encoding = None # see extsetup +_encoding = None # see extsetup + def decode(arg): if isinstance(arg, str): @@ -89,6 +90,7 @@ arg[k] = decode(v) return arg + def encode(arg): if isinstance(arg, pycompat.unicode): return arg.encode(_encoding) @@ -101,6 +103,7 @@ arg[k] = encode(v) return arg + def appendsep(s): # ensure the path ends with os.sep, appending it if necessary. try: @@ -123,8 +126,11 @@ # return value. return enc(func(*dec(args), **dec(kwds))) except UnicodeError: - raise error.Abort(_("[win32mbcs] filename conversion failed with" - " %s encoding\n") % (_encoding)) + raise error.Abort( + _("[win32mbcs] filename conversion failed with" " %s encoding\n") + % _encoding + ) + def wrapper(func, args, kwds): return basewrapper(func, pycompat.unicode, encode, decode, args, kwds) @@ -133,6 +139,7 @@ def reversewrapper(func, args, kwds): return basewrapper(func, str, decode, encode, args, kwds) + def wrapperforlistdir(func, args, kwds): # Ensure 'path' argument ends with os.sep to avoids # misinterpreting last 0x5c of MBCS 2nd byte as path separator. @@ -143,15 +150,19 @@ kwds['path'] = appendsep(kwds['path']) return func(*args, **kwds) + def wrapname(name, wrapper): module, name = name.rsplit('.', 1) module = sys.modules[module] func = getattr(module, name) + def f(*args, **kwds): return wrapper(func, args, kwds) + f.__name__ = func.__name__ setattr(module, name, f) + # List of functions to be wrapped. # NOTE: os.path.dirname() and os.path.basename() are safe because # they use result of os.path.split() @@ -177,10 +188,12 @@ sjis s_jis shift_jis_2004 shiftjis2004 sjis_2004 sjis2004 shift_jisx0213 shiftjisx0213 sjisx0213 s_jisx0213 950 cp950 ms950 ''' + def extsetup(ui): # TODO: decide use of config section for this extension - if ((not os.path.supports_unicode_filenames) and - (pycompat.sysplatform != 'cygwin')): + if (not os.path.supports_unicode_filenames) and ( + pycompat.sysplatform != 'cygwin' + ): ui.warn(_("[win32mbcs] cannot activate on this platform.\n")) return # determine encoding for filename @@ -202,5 +215,4 @@ # command line options is not yet applied when # extensions.loadall() is called. if '--debug' in sys.argv: - ui.write(("[win32mbcs] activated with encoding: %s\n") - % _encoding) + ui.write("[win32mbcs] activated with encoding: %s\n" % _encoding)