Skip to content

Commit d6dafe7

Browse files
blarghmateyCopilot
andcommitted
Fix pylint E0611: disable no-name-in-module for BaseObjectProxy compat shim
pylint with wrapt 1.x installed reports E0611 ('No name BaseObjectProxy in module wrapt') when it sees the try/except ImportError compat shim, even though the except branch provides a fallback. Add a per-line pylint disable comment to suppress this false positive. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent f4ea232 commit d6dafe7

File tree

6 files changed

+6
-6
lines changed
  • instrumentation
    • opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi
    • opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc
    • opentelemetry-instrumentation-httpx/tests
    • opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika
  • opentelemetry-instrumentation

6 files changed

+6
-6
lines changed

instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
from wrapt import wrap_function_wrapper
177177

178178
try:
179-
from wrapt import BaseObjectProxy
179+
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
180180
except ImportError:
181181
from wrapt import ObjectProxy as BaseObjectProxy
182182

instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_aio_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import grpc.aio
1717

1818
try:
19-
from wrapt import BaseObjectProxy
19+
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
2020
except ImportError:
2121
from wrapt import ObjectProxy as BaseObjectProxy
2222

instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import respx
2525

2626
try:
27-
from wrapt import BaseObjectProxy
27+
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
2828
except ImportError:
2929
from wrapt import ObjectProxy as BaseObjectProxy
3030

instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from pika.spec import Basic, BasicProperties
1010

1111
try:
12-
from wrapt import BaseObjectProxy
12+
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
1313
except ImportError:
1414
from wrapt import ObjectProxy as BaseObjectProxy
1515

opentelemetry-instrumentation/src/opentelemetry/instrumentation/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from typing import Any, Dict, Generator, Sequence
2222

2323
try:
24-
from wrapt import BaseObjectProxy
24+
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
2525
except ImportError:
2626
from wrapt import ObjectProxy as BaseObjectProxy
2727

opentelemetry-instrumentation/tests/test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from wrapt import wrap_function_wrapper
1919

2020
try:
21-
from wrapt import BaseObjectProxy
21+
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
2222
except ImportError:
2323
from wrapt import ObjectProxy as BaseObjectProxy
2424

0 commit comments

Comments
 (0)