| indygreg |
| hg-reviewers |
This is getfullargspec on py3, which means we can't use namedtuple
named accessors for all fields (eg keywords from getargspec is varkw
from getfullargspec, with the same meaning). Solves some warning
issues on Python 3.
I didn't clean up httpclient because that's vendored code I think we
should probably discard, and I didn't touch the manpage generator for
now either.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/perf.py (9 lines) | |||
| M | mercurial/extensions.py (6 lines) | |||
| M | mercurial/localrepo.py (3 lines) | |||
| M | mercurial/pycompat.py (4 lines) |
| def _runextsetup(name, ui): | def _runextsetup(name, ui): | ||||
| extsetup = getattr(_extensions[name], 'extsetup', None) | extsetup = getattr(_extensions[name], 'extsetup', None) | ||||
| if extsetup: | if extsetup: | ||||
| try: | try: | ||||
| try: | try: | ||||
| extsetup(ui) | extsetup(ui) | ||||
| except TypeError: | except TypeError: | ||||
| # Try to use getfullargspec (Python 3) first, and fall | if pycompat.getargspec(extsetup).args: | ||||
| # back to getargspec only if it doesn't exist so as to | |||||
| # avoid warnings. | |||||
| if getattr(inspect, 'getfullargspec', | |||||
| getattr(inspect, 'getargspec'))(extsetup).args: | |||||
| raise | raise | ||||
| extsetup() # old extsetup with no ui argument | extsetup() # old extsetup with no ui argument | ||||
| except Exception as inst: | except Exception as inst: | ||||
| ui.traceback(force=True) | ui.traceback(force=True) | ||||
| msg = util.forcebytestr(inst) | msg = util.forcebytestr(inst) | ||||
| ui.warn(_("*** failed to set up extension %s: %s\n") % (name, msg)) | ui.warn(_("*** failed to set up extension %s: %s\n") % (name, msg)) | ||||
| return False | return False | ||||
| return True | return True | ||||
| # localrepo.py - read/write repository class for mercurial | # localrepo.py - read/write repository class for mercurial | ||||
| # | # | ||||
| # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import errno | import errno | ||||
| import hashlib | import hashlib | ||||
| import inspect | |||||
| import os | import os | ||||
| import random | import random | ||||
| import time | import time | ||||
| import weakref | import weakref | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .node import ( | from .node import ( | ||||
| hex, | hex, | ||||
| for name, filterfn in self._datafilters.iteritems(): | for name, filterfn in self._datafilters.iteritems(): | ||||
| if cmd.startswith(name): | if cmd.startswith(name): | ||||
| fn = filterfn | fn = filterfn | ||||
| params = cmd[len(name):].lstrip() | params = cmd[len(name):].lstrip() | ||||
| break | break | ||||
| if not fn: | if not fn: | ||||
| fn = lambda s, c, **kwargs: util.filter(s, c) | fn = lambda s, c, **kwargs: util.filter(s, c) | ||||
| # Wrap old filters not supporting keyword arguments | # Wrap old filters not supporting keyword arguments | ||||
| if not inspect.getargspec(fn)[2]: | if not pycompat.getargspec(fn)[2]: | ||||
| oldfn = fn | oldfn = fn | ||||
| fn = lambda s, c, **kwargs: oldfn(s, c) | fn = lambda s, c, **kwargs: oldfn(s, c) | ||||
| l.append((mf, fn, params)) | l.append((mf, fn, params)) | ||||
| self.filterpats[filter] = l | self.filterpats[filter] = l | ||||
| return self.filterpats[filter] | return self.filterpats[filter] | ||||
| def _filter(self, filterpats, filename, data): | def _filter(self, filterpats, filename, data): | ||||
| for mf, fn, cmd in filterpats: | for mf, fn, cmd in filterpats: | ||||
| # pycompat.py - portability shim for python 3 | # pycompat.py - portability shim for python 3 | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| """Mercurial portability shim for python 3. | """Mercurial portability shim for python 3. | ||||
| This contains aliases to hide python version-specific details from the core. | This contains aliases to hide python version-specific details from the core. | ||||
| """ | """ | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import getopt | import getopt | ||||
| import inspect | |||||
| import os | import os | ||||
| import shlex | import shlex | ||||
| import sys | import sys | ||||
| ispy3 = (sys.version_info[0] >= 3) | ispy3 = (sys.version_info[0] >= 3) | ||||
| ispypy = (r'__pypy__' in sys.builtin_module_names) | ispypy = (r'__pypy__' in sys.builtin_module_names) | ||||
| if not ispy3: | if not ispy3: | ||||
| sysplatform = sys.platform.encode('ascii') | sysplatform = sys.platform.encode('ascii') | ||||
| sysexecutable = sys.executable | sysexecutable = sys.executable | ||||
| if sysexecutable: | if sysexecutable: | ||||
| sysexecutable = os.fsencode(sysexecutable) | sysexecutable = os.fsencode(sysexecutable) | ||||
| stringio = io.BytesIO | stringio = io.BytesIO | ||||
| maplist = lambda *args: list(map(*args)) | maplist = lambda *args: list(map(*args)) | ||||
| ziplist = lambda *args: list(zip(*args)) | ziplist = lambda *args: list(zip(*args)) | ||||
| rawinput = input | rawinput = input | ||||
| getargspec = inspect.getfullargspec | |||||
| # TODO: .buffer might not exist if std streams were replaced; we'll need | # TODO: .buffer might not exist if std streams were replaced; we'll need | ||||
| # a silly wrapper to make a bytes stream backed by a unicode one. | # a silly wrapper to make a bytes stream backed by a unicode one. | ||||
| stdin = sys.stdin.buffer | stdin = sys.stdin.buffer | ||||
| stdout = sys.stdout.buffer | stdout = sys.stdout.buffer | ||||
| stderr = sys.stderr.buffer | stderr = sys.stderr.buffer | ||||
| # Since Python 3 converts argv to wchar_t type by Py_DecodeLocale() on Unix, | # Since Python 3 converts argv to wchar_t type by Py_DecodeLocale() on Unix, | ||||
| sysplatform = sys.platform | sysplatform = sys.platform | ||||
| getcwd = os.getcwd | getcwd = os.getcwd | ||||
| sysexecutable = sys.executable | sysexecutable = sys.executable | ||||
| shlexsplit = shlex.split | shlexsplit = shlex.split | ||||
| stringio = cStringIO.StringIO | stringio = cStringIO.StringIO | ||||
| maplist = map | maplist = map | ||||
| ziplist = zip | ziplist = zip | ||||
| rawinput = raw_input | rawinput = raw_input | ||||
| getargspec = inspect.getargspec | |||||
| def emailparser(*args, **kwargs): | def emailparser(*args, **kwargs): | ||||
| import email.parser | import email.parser | ||||
| return email.parser.Parser(*args, **kwargs) | return email.parser.Parser(*args, **kwargs) | ||||
| isjython = sysplatform.startswith('java') | isjython = sysplatform.startswith('java') | ||||
| isdarwin = sysplatform == 'darwin' | isdarwin = sysplatform == 'darwin' | ||||
| isposix = osname == 'posix' | isposix = osname == 'posix' | ||||
| iswindows = osname == 'nt' | iswindows = osname == 'nt' | ||||
| def getoptb(args, shortlist, namelist): | def getoptb(args, shortlist, namelist): | ||||
| return _getoptbwrapper(getopt.getopt, args, shortlist, namelist) | return _getoptbwrapper(getopt.getopt, args, shortlist, namelist) | ||||
| def gnugetoptb(args, shortlist, namelist): | def gnugetoptb(args, shortlist, namelist): | ||||
| return _getoptbwrapper(getopt.gnu_getopt, args, shortlist, namelist) | return _getoptbwrapper(getopt.gnu_getopt, args, shortlist, namelist) | ||||
This looks like a double space. I'll fix this in flight.