lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-05 19:55:47 +03:00
Code Activity

DebugWipeFinder fixes for 3.12

Browse Source 
Summary:
X-link: https://github.com/facebookincubator/zstrong/pull/662

find_module has been deprecated for some time. Instead use find_spec

Reviewed By: itamaro

Differential Revision: D52495680

fbshipit-source-id: 9b827a783af2d858816a8d197530874f680502f3
This commit is contained in:
Jason Fried
2024-01-04 12:59:20 -08:00
committed by Facebook GitHub Bot
parent 09e1ca006b
commit 0dc2acaa7d
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
build/fbcode_builder/CMake/fb_py_test_main.py
View File

@@ -22,11 +22,8 @@ import time
import traceback import traceback
import unittest import unittest
import warnings import warnings
from importlib.machinery import PathFinder
# Hide warning about importing "imp"; remove once python2 is gone.
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
import imp
try: try:
from StringIO import StringIO from StringIO import StringIO
@@ -82,7 +79,7 @@ class PathMatcher(object):
return not self.omit(path) return not self.omit(path)
class DebugWipeFinder(object): class DebugWipeFinder(PathFinder):
""" """
PEP 302 finder that uses a DebugWipeLoader for all files which do not need PEP 302 finder that uses a DebugWipeLoader for all files which do not need
coverage coverage
@@ -91,28 +88,15 @@ class DebugWipeFinder(object):
def __init__(self, matcher): def __init__(self, matcher):
self.matcher = matcher self.matcher = matcher
def find_module(self, fullname, path=None): def find_spec(self, fullname, path=None, target=None):
_, _, basename = fullname.rpartition(".") spec = super().find_spec(fullname, path=path, target=target)
try: if spec is None or spec.origin is None:
fd, pypath, (_, _, kind) = imp.find_module(basename, path)
except Exception:
# Finding without hooks using the imp module failed. One reason
# could be that there is a zip file on sys.path. The imp module
# does not support loading from there. Leave finding this module to
# the others finders in sys.meta_path.
return None return None
if not spec.origin.endswith(".py"):
if hasattr(fd, "close"):
fd.close()
if kind != imp.PY_SOURCE:
return None return None
if self.matcher.include(pypath): if self.matcher.include(spec.origin):
return None return None
"""
This is defined to match CPython's PyVarObject struct
"""
class PyVarObject(ctypes.Structure): class PyVarObject(ctypes.Structure):
_fields_ = [ _fields_ = [
("ob_refcnt", ctypes.c_long), ("ob_refcnt", ctypes.c_long),
@@ -126,7 +110,7 @@ class DebugWipeFinder(object):
""" """
def get_code(self, fullname): def get_code(self, fullname):
code = super(DebugWipeLoader, self).get_code(fullname) code = super().get_code(fullname)
if code: if code:
# Ideally we'd do # Ideally we'd do
# code.co_lnotab = b'' # code.co_lnotab = b''
@@ -136,7 +120,8 @@ class DebugWipeFinder(object):
code_impl.ob_size = 0 code_impl.ob_size = 0
return code return code
return DebugWipeLoader(fullname, pypath) spec.loader = DebugWipeLoader(fullname, spec.origin)
return spec
def optimize_for_coverage(cov, include_patterns, omit_patterns): def optimize_for_coverage(cov, include_patterns, omit_patterns):