mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
75 lines
2.0 KiB
Python
75 lines
2.0 KiB
Python
from __future__ import absolute_import, print_function
|
|
|
|
from edenscm.mercurial import extensions
|
|
|
|
|
|
def genwrapper(x):
|
|
def f(orig, *args, **kwds):
|
|
return [x] + orig(*args, **kwds)
|
|
|
|
f.x = x
|
|
return f
|
|
|
|
|
|
def getid(wrapper):
|
|
return getattr(wrapper, "x", "-")
|
|
|
|
|
|
wrappers = [genwrapper(i) for i in range(5)]
|
|
|
|
|
|
class dummyclass(object):
|
|
def getstack(self):
|
|
return ["orig"]
|
|
|
|
|
|
dummy = dummyclass()
|
|
|
|
|
|
def batchwrap(wrappers):
|
|
for w in wrappers:
|
|
extensions.wrapfunction(dummy, "getstack", w)
|
|
print("wrap %d: %s" % (getid(w), dummy.getstack()))
|
|
|
|
|
|
def batchunwrap(wrappers):
|
|
for w in wrappers:
|
|
result = None
|
|
try:
|
|
result = extensions.unwrapfunction(dummy, "getstack", w)
|
|
msg = str(dummy.getstack())
|
|
except (ValueError, IndexError) as e:
|
|
msg = e.__class__.__name__
|
|
print("unwrap %s: %s: %s" % (getid(w), getid(result), msg))
|
|
|
|
|
|
batchwrap(wrappers + [wrappers[0]])
|
|
batchunwrap([(wrappers[i] if i >= 0 else None) for i in [3, None, 0, 4, 0, 2, 1, None]])
|
|
|
|
wrap0 = extensions.wrappedfunction(dummy, "getstack", wrappers[0])
|
|
wrap1 = extensions.wrappedfunction(dummy, "getstack", wrappers[1])
|
|
|
|
# Use them in a different order from how they were created to check that
|
|
# the wrapping happens in __enter__, not in __init__
|
|
print("context manager", dummy.getstack())
|
|
with wrap1:
|
|
print("context manager", dummy.getstack())
|
|
with wrap0:
|
|
print("context manager", dummy.getstack())
|
|
# Bad programmer forgets to unwrap the function, but the context
|
|
# managers still unwrap their wrappings.
|
|
extensions.wrapfunction(dummy, "getstack", wrappers[2])
|
|
print("context manager", dummy.getstack())
|
|
print("context manager", dummy.getstack())
|
|
print("context manager", dummy.getstack())
|
|
|
|
# Wrap callable object which has no __name__
|
|
class callableobj(object):
|
|
def __call__(self):
|
|
return ["orig"]
|
|
|
|
|
|
dummy.cobj = callableobj()
|
|
extensions.wrapfunction(dummy, "cobj", wrappers[0])
|
|
print("wrap callable object", dummy.cobj())
|