This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7007

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

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

Details

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

Continuing to eliminate the implicit import of symbols in the
Python 3 source transformer so we can eliminate it.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

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

Revision Contents
Changeset List

Diff 16922

hgext/factotum.py

service entry controls the service name used when reading keys. service entry controls the service name used when reading keys.
''' '''
from __future__ import absolute_import from __future__ import absolute_import
import os import os
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import setattr
from mercurial.utils import procutil from mercurial.utils import procutil
from mercurial import ( from mercurial import (
error, error,
httpconnection, httpconnection,
registrar, registrar,
url, url,
util, util,
) )

hgext/fastannotate/context.py

# Copyright 2016-present Facebook. All Rights Reserved. # Copyright 2016-present Facebook. All Rights Reserved.
# #
# context: context needed to annotate a file # context: context needed to annotate a file
# #
# 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 collections import collections
import contextlib import contextlib
import hashlib import hashlib
import os import os
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import open from mercurial.pycompat import (
open,
setattr,
)
from mercurial import ( from mercurial import (
error, error,
linelog as linelogmod, linelog as linelogmod,
lock as lockmod, lock as lockmod,
mdiff, mdiff,
node, node,
pycompat, pycompat,
scmutil, scmutil,

hgext/fix.py

import json import json
import os import os
import re import re
import subprocess import subprocess
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import nullrev from mercurial.node import nullrev
from mercurial.node import wdirrev from mercurial.node import wdirrev
from mercurial.pycompat import setattr
from mercurial.utils import ( from mercurial.utils import (
procutil, procutil,
stringutil, stringutil,
) )
from mercurial import ( from mercurial import (
cmdutil, cmdutil,

hgext/lfs/wrapper.py

# wrapper.py - methods wrapping core mercurial logic # wrapper.py - methods wrapping core mercurial logic
# #
# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# 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 hashlib import hashlib
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import bin, hex, nullid, short from mercurial.node import bin, hex, nullid, short
from mercurial.pycompat import setattr
from mercurial import ( from mercurial import (
bundle2, bundle2,
changegroup, changegroup,
cmdutil, cmdutil,
context, context,
error, error,
exchange, exchange,

hgext/sparse.py

[exclude] [exclude]
tools/tests/** tools/tests/**
""" """
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import setattr
from mercurial import ( from mercurial import (
commands, commands,
dirstate, dirstate,
error, error,
extensions, extensions,
hg, hg,
logcmdutil, logcmdutil,
match as matchmod, match as matchmod,

hgext/win32mbcs.py

It is useful for the users who want to commit with UTF-8 log message. It is useful for the users who want to commit with UTF-8 log message.
''' '''
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import sys import sys
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import setattr
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
pycompat, pycompat,
registrar, registrar,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for

mercurial/__init__.py

if t.type == token.NEWLINE and futureimpline: if t.type == token.NEWLINE and futureimpline:
futureimpline = False futureimpline = False
if fullname == 'mercurial.pycompat': if fullname == 'mercurial.pycompat':
yield t yield t
continue continue
r, c = t.start r, c = t.start
l = ( l = (
b'; from mercurial.pycompat import ' b'; from mercurial.pycompat import '
b'delattr, getattr, hasattr, setattr\n' b'delattr, getattr, hasattr\n'
) )
for u in tokenize.tokenize(io.BytesIO(l).readline): for u in tokenize.tokenize(io.BytesIO(l).readline):
if u.type in (tokenize.ENCODING, token.ENDMARKER): if u.type in (tokenize.ENCODING, token.ENDMARKER):
continue continue
yield u._replace( yield u._replace(
start=(r, c + u.start[1]), end=(r, c + u.end[1]) start=(r, c + u.start[1]), end=(r, c + u.end[1])
) )
continue continue
# 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\x0e' BYTECODEHEADER = b'HG\x00\x0f'
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/chgserver.py

import os import os
import re import re
import socket import socket
import stat import stat
import struct import struct
import time import time
from .i18n import _ from .i18n import _
from .pycompat import setattr
from . import ( from . import (
commandserver, commandserver,
encoding, encoding,
error, error,
extensions, extensions,
node, node,
pycompat, pycompat,

mercurial/cmdutil.py

from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
nullid, nullid,
nullrev, nullrev,
short, short,
) )
from .pycompat import open from .pycompat import (
open,
setattr,
)
from . import ( from . import (
bookmarks, bookmarks,
changelog, changelog,
copies, copies,
crecord as crecordmod, crecord as crecordmod,
dirstateguard, dirstateguard,
encoding, encoding,

mercurial/extensions.py

import imp import imp
import inspect import inspect
import os import os
from .i18n import ( from .i18n import (
_, _,
gettext, gettext,
) )
from .pycompat import open from .pycompat import (
open,
setattr,
)
from . import ( from . import (
cmdutil, cmdutil,
configitems, configitems,
error, error,
pycompat, pycompat,
util, util,
) )

mercurial/hgweb/webutil.py

import copy import copy
import difflib import difflib
import os import os
import re import re
from ..i18n import _ from ..i18n import _
from ..node import hex, nullid, short from ..node import hex, nullid, short
from ..pycompat import setattr
from .common import ( from .common import (
ErrorResponse, ErrorResponse,
HTTP_BAD_REQUEST, HTTP_BAD_REQUEST,
HTTP_NOT_FOUND, HTTP_NOT_FOUND,
paritygen, paritygen,
) )

mercurial/mdiff.py

# mdiff.py - diff and patch routines for mercurial # mdiff.py - diff and patch routines for mercurial
# #
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> # Copyright 2005, 2006 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 re import re
import struct import struct
import zlib import zlib
from .i18n import _ from .i18n import _
from .pycompat import setattr
from . import ( from . import (
encoding, encoding,
error, error,
policy, policy,
pycompat, pycompat,
util, util,
) )
from .utils import dateutil from .utils import dateutil

mercurial/phases.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 setattr
from . import ( from . import (
error, error,
pycompat, pycompat,
smartset, smartset,
txnutil, txnutil,
util, util,
) )

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
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):
""" """
Partial backport from os.py in Python 3, which only accepts bytes. Partial backport from os.py in Python 3, which only accepts bytes.
In Python 2, our paths should only ever be bytes, a unicode path In Python 2, our paths should only ever be bytes, a unicode path

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 setattr
from . import ( from . import (
obsolete, obsolete,
phases, phases,
pycompat, pycompat,
tags as tagsmod, tags as tagsmod,
util, util,
) )
from .utils import repoviewutil from .utils import repoviewutil

mercurial/ui.py

import signal import signal
import socket import socket
import subprocess import subprocess
import sys import sys
import traceback import traceback
from .i18n import _ from .i18n import _
from .node import hex from .node import hex
from .pycompat import open from .pycompat import (
open,
setattr,
)
from . import ( from . import (
color, color,
config, config,
configitems, configitems,
encoding, encoding,
error, error,
formatter, formatter,

mercurial/util.py

import socket import socket
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 open from .pycompat import (
open,
setattr,
)
from hgdemandimport import tracing from hgdemandimport import tracing
from . import ( from . import (
encoding, encoding,
error, error,
i18n, i18n,
node as nodemod, node as nodemod,
policy, policy,
pycompat, pycompat,

mercurial/vfs.py

# vfs.py - Mercurial 'vfs' classes # vfs.py - Mercurial 'vfs' classes
# #
# Copyright Matt Mackall <mpm@selenic.com> # Copyright 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 contextlib import contextlib
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 setattr
from . import ( from . import (
encoding, encoding,
error, error,
pathutil, pathutil,
pycompat, pycompat,
util, util,
) )

mercurial/wireprotov1peer.py

# wireprotov1peer.py - Client-side functionality for wire protocol version 1. # wireprotov1peer.py - Client-side functionality for wire protocol version 1.
# #
# Copyright 2005-2010 Matt Mackall <mpm@selenic.com> # Copyright 2005-2010 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 hashlib import hashlib
import sys import sys
import weakref import weakref
from .i18n import _ from .i18n import _
from .node import bin from .node import bin
from .pycompat import setattr
from . import ( from . import (
bundle2, bundle2,
changegroup as changegroupmod, changegroup as changegroupmod,
encoding, encoding,
error, error,
pushkey as pushkeymod, pushkey as pushkeymod,
pycompat, pycompat,
util, util,