This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7010

py3: manually import pycompat.delattr where it is needed
ClosedPublic

Authored by indygreg on Oct 6 2019, 5:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1f339b503a40: py3: manually import pycompat.delattr where it is needed
Summary

And with this change, we no longer need the auto-inserted import statement
in the source transformer, so it has been removed!

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

indygreg created this revision.Oct 6 2019, 5:23 PM
indygreg added a commit: rHG1f339b503a40: py3: manually import pycompat.delattr where it is needed.Oct 7 2019, 10:38 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1f339b503a40: py3: manually import pycompat.delattr where it is needed (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 16933

hgext/mq.py

from mercurial.node import ( from mercurial.node import (
bin, bin,
hex, hex,
nullid, nullid,
nullrev, nullrev,
short, short,
) )
from mercurial.pycompat import ( from mercurial.pycompat import (
delattr,
getattr, getattr,
open, open,
) )
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
commands, commands,
dirstateguard, dirstateguard,
encoding, encoding,

mercurial/__init__.py

Returns a generator of possibly rewritten tokens. Returns a generator of possibly rewritten tokens.
The input token list may be mutated as part of processing. However, The input token list may be mutated as part of processing. However,
its changes do not necessarily match the output token stream. its changes do not necessarily match the output token stream.
REMEMBER TO CHANGE ``BYTECODEHEADER`` WHEN CHANGING THIS FUNCTION REMEMBER TO CHANGE ``BYTECODEHEADER`` WHEN CHANGING THIS FUNCTION
OR CACHED FILES WON'T GET INVALIDATED PROPERLY. OR CACHED FILES WON'T GET INVALIDATED PROPERLY.
""" """
futureimpline = False
# The following utility functions access the tokens list and i index of # The following utility functions access the tokens list and i index of
# the for i, t enumerate(tokens) loop below # the for i, t enumerate(tokens) loop below
def _isop(j, *o): def _isop(j, *o):
"""Assert that tokens[j] is an OP with one of the given values""" """Assert that tokens[j] is an OP with one of the given values"""
try: try:
return tokens[j].type == token.OP and tokens[j].string in o return tokens[j].type == token.OP and tokens[j].string in o
except IndexError: except IndexError:
return False return False
already been done. already been done.
""" """
st = tokens[j] st = tokens[j]
if st.type == token.STRING and st.string.startswith(("'", '"')): if st.type == token.STRING and st.string.startswith(("'", '"')):
tokens[j] = st._replace(string='u%s' % st.string) tokens[j] = st._replace(string='u%s' % st.string)
for i, t in enumerate(tokens): for i, t in enumerate(tokens):
# Insert compatibility imports at "from __future__ import" line.
# No '\n' should be added to preserve line numbers.
if (
t.type == token.NAME
and t.string == 'import'
and all(u.type == token.NAME for u in tokens[i - 2 : i])
and [u.string for u in tokens[i - 2 : i]]
== ['from', '__future__']
):
futureimpline = True
if t.type == token.NEWLINE and futureimpline:
futureimpline = False
if fullname == 'mercurial.pycompat':
yield t
continue
r, c = t.start
l = (
b'; from mercurial.pycompat import '
b'delattr\n'
)
for u in tokenize.tokenize(io.BytesIO(l).readline):
if u.type in (tokenize.ENCODING, token.ENDMARKER):
continue
yield u._replace(
start=(r, c + u.start[1]), end=(r, c + u.end[1])
)
continue
# This looks like a function call. # This looks like a function call.
if t.type == token.NAME and _isop(i + 1, '('): if t.type == token.NAME and _isop(i + 1, '('):
fn = t.string fn = t.string
# *attr() builtins don't accept byte strings to 2nd argument. # *attr() builtins don't accept byte strings to 2nd argument.
if fn in ( if fn in (
'getattr', 'getattr',
'setattr', 'setattr',
# Emit unmodified token. # Emit unmodified token.
yield t yield t
# Header to add to bytecode files. This MUST be changed when # Header to add to bytecode files. This MUST be changed when
# ``replacetoken`` or any mechanism that changes semantics of module # ``replacetoken`` or any mechanism that changes semantics of module
# loading is changed. Otherwise cached bytecode may get loaded without # loading is changed. Otherwise cached bytecode may get loaded without
# the new transformation mechanisms applied. # the new transformation mechanisms applied.
BYTECODEHEADER = b'HG\x00\x11' BYTECODEHEADER = b'HG\x00\x12'
class hgloader(importlib.machinery.SourceFileLoader): class hgloader(importlib.machinery.SourceFileLoader):
"""Custom module loader that transforms source code. """Custom module loader that transforms source code.
When the source code is converted to a code object, we transform When the source code is converted to a code object, we transform
certain patterns to be Python 3 compatible. This allows us to write code certain patterns to be Python 3 compatible. This allows us to write code
that is natively Python 2 and compatible with Python 3 without that is natively Python 2 and compatible with Python 3 without
making the code excessively ugly. making the code excessively ugly.

mercurial/dirstate.py

import collections import collections
import contextlib import contextlib
import errno import errno
import os import os
import stat import stat
from .i18n import _ from .i18n import _
from .node import nullid from .node import nullid
from .pycompat import delattr
from . import ( from . import (
encoding, encoding,
error, error,
match as matchmod, match as matchmod,
pathutil, pathutil,
policy, policy,
pycompat, pycompat,
scmutil, scmutil,

mercurial/localrepo.py

from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex, hex,
nullid, nullid,
nullrev, nullrev,
short, short,
) )
from .pycompat import getattr from .pycompat import (
delattr,
getattr,
)
from . import ( from . import (
bookmarks, bookmarks,
branchmap, branchmap,
bundle2, bundle2,
changegroup, changegroup,
color, color,
context, context,
dirstate, dirstate,

mercurial/merge.py

addednodeid, addednodeid,
bin, bin,
hex, hex,
modifiednodeid, modifiednodeid,
nullhex, nullhex,
nullid, nullid,
nullrev, nullrev,
) )
from .pycompat import delattr
from .thirdparty import attr from .thirdparty import attr
from . import ( from . import (
copies, copies,
encoding, encoding,
error, error,
filemerge, filemerge,
match as matchmod, match as matchmod,
obsutil, obsutil,

mercurial/pycompat.py

bytestr = str bytestr = str
iterbytestr = iter iterbytestr = iter
maybebytestr = identity maybebytestr = identity
sysbytes = identity sysbytes = identity
sysstr = identity sysstr = identity
strurl = identity strurl = identity
bytesurl = identity bytesurl = identity
open = open open = open
delattr = delattr
getattr = getattr getattr = getattr
hasattr = hasattr hasattr = hasattr
setattr = setattr setattr = setattr
# this can't be parsed on Python 3 # this can't be parsed on Python 3
exec(b'def raisewithtb(exc, tb):\n' b' raise exc, None, tb\n') exec(b'def raisewithtb(exc, tb):\n' b' raise exc, None, tb\n')
def fsencode(filename): def fsencode(filename):

mercurial/repoview.py

# repoview.py - Filtered view of a localrepo object # repoview.py - Filtered view of a localrepo object
# #
# Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org> # Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Logilab SA <contact@logilab.fr> # Logilab SA <contact@logilab.fr>
# #
# 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 copy import copy
import weakref import weakref
from .node import nullrev from .node import nullrev
from .pycompat import ( from .pycompat import (
delattr,
getattr, getattr,
setattr, setattr,
) )
from . import ( from . import (
obsolete, obsolete,
phases, phases,
pycompat, pycompat,
tags as tagsmod, tags as tagsmod,

mercurial/util.py

import stat import stat
import sys import sys
import time import time
import traceback import traceback
import warnings import warnings
from .thirdparty import attr from .thirdparty import attr
from .pycompat import ( from .pycompat import (
delattr,
getattr, getattr,
open, open,
setattr, setattr,
) )
from hgdemandimport import tracing from hgdemandimport import tracing
from . import ( from . import (
encoding, encoding,
error, error,

mercurial/vfs.py

import errno import errno
import os import os
import shutil import shutil
import stat import stat
import threading import threading
from .i18n import _ from .i18n import _
from .pycompat import ( from .pycompat import (
delattr,
getattr, getattr,
setattr, setattr,
) )
from . import ( from . import (
encoding, encoding,
error, error,
pathutil, pathutil,
pycompat, pycompat,