From e5e5343047dc968363a18f93a447863038e1d655 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 4 Nov 2021 12:26:53 -0400 Subject: [PATCH] Revert "Fix some alerts from the LGTM system (#11143)" (#11436) This reverts commit 3504fc104309e96b8df8178792ceaee9588f13db. That commit seems to have broken cirque. --- scripts/tools/memory/memdf/df.py | 3 +-- scripts/tools/memory/report_summary.py | 2 ++ src/controller/python/chip/ChipBleUtility.py | 2 +- src/controller/python/chip/ChipBluezMgr.py | 2 +- src/controller/python/chip/ChipCommissionableNodeCtrl.py | 2 +- src/controller/python/chip/ChipCoreBluetoothMgr.py | 2 +- src/controller/python/chip/ChipDeviceCtrl.py | 6 +++--- src/controller/python/chip/ChipStack.py | 2 +- src/controller/python/chip/ChipUtility.py | 2 +- src/controller/python/chip/ble/library_handle.py | 2 +- src/controller/python/chip/clusters/Command.py | 4 ++-- src/controller/python/chip/clusters/__init__.py | 2 +- src/controller/python/chip/interaction_model/__init__.py | 2 +- src/controller/python/chip/interaction_model/delegate.py | 2 +- 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/scripts/tools/memory/memdf/df.py b/scripts/tools/memory/memdf/df.py index 7345f41e0163a6..a91e44c669d94b 100644 --- a/scripts/tools/memory/memdf/df.py +++ b/scripts/tools/memory/memdf/df.py @@ -32,8 +32,7 @@ def __init__(self, *args, **kwargs): self[c] = pd.Series() types = {c: self.dtype[c] for c in self.columns if c in self.dtype} typed_columns = list(types.keys()) - self[typed_columns] = self.astype(types, copy=False)[ - typed_columns] # lgtm [py/hash-unhashable-value] + self[typed_columns] = self.astype(types, copy=False)[typed_columns] self.attrs['name'] = self.name diff --git a/scripts/tools/memory/report_summary.py b/scripts/tools/memory/report_summary.py index 5a3d0cd4ded8d0..3b21f6a88bb8ea 100755 --- a/scripts/tools/memory/report_summary.py +++ b/scripts/tools/memory/report_summary.py @@ -28,6 +28,8 @@ import sys +import numpy # type: ignore + import memdf.collect import memdf.report import memdf.select diff --git a/src/controller/python/chip/ChipBleUtility.py b/src/controller/python/chip/ChipBleUtility.py index db0f1a4b01245b..95abc3b7c8be76 100644 --- a/src/controller/python/chip/ChipBleUtility.py +++ b/src/controller/python/chip/ChipBleUtility.py @@ -24,7 +24,7 @@ from __future__ import absolute_import from __future__ import print_function -from ctypes import * # lgtm [py/polluting-import] +from ctypes import * from .ChipUtility import ChipUtility diff --git a/src/controller/python/chip/ChipBluezMgr.py b/src/controller/python/chip/ChipBluezMgr.py index 9e703360c81116..13b8b28cdb9452 100644 --- a/src/controller/python/chip/ChipBluezMgr.py +++ b/src/controller/python/chip/ChipBluezMgr.py @@ -35,7 +35,7 @@ import uuid import queue -from ctypes import CFUNCTYPE, PYFUNCTYPE, c_void_p, c_int +from ctypes import * try: from gi.repository import GObject diff --git a/src/controller/python/chip/ChipCommissionableNodeCtrl.py b/src/controller/python/chip/ChipCommissionableNodeCtrl.py index c13aa828f51d8a..87b9f5ca9dd737 100644 --- a/src/controller/python/chip/ChipCommissionableNodeCtrl.py +++ b/src/controller/python/chip/ChipCommissionableNodeCtrl.py @@ -25,7 +25,7 @@ from __future__ import absolute_import from __future__ import print_function -from ctypes import c_void_p, c_uint32 +from ctypes import * from .ChipStack import * from .exceptions import * diff --git a/src/controller/python/chip/ChipCoreBluetoothMgr.py b/src/controller/python/chip/ChipCoreBluetoothMgr.py index e24955260f480c..b10a2156af453e 100644 --- a/src/controller/python/chip/ChipCoreBluetoothMgr.py +++ b/src/controller/python/chip/ChipCoreBluetoothMgr.py @@ -24,7 +24,7 @@ from __future__ import absolute_import from __future__ import print_function -from ctypes import * # lgtm [py/polluting-import] +from ctypes import * from Foundation import * import logging diff --git a/src/controller/python/chip/ChipDeviceCtrl.py b/src/controller/python/chip/ChipDeviceCtrl.py index 535a10482b6f33..3eee5650981f72 100644 --- a/src/controller/python/chip/ChipDeviceCtrl.py +++ b/src/controller/python/chip/ChipDeviceCtrl.py @@ -28,7 +28,7 @@ from __future__ import absolute_import from __future__ import print_function import asyncio -from ctypes import * # lgtm [py/polluting-import] +from ctypes import * from .ChipStack import * from .interaction_model import delegate as im from .exceptions import * @@ -334,11 +334,11 @@ def DeviceAvailableCallback(device, err): # The callback might have been received synchronously (during self._ChipStack.Call()). # Check if the device is already set before waiting for the callback. - if returnDevice.value is None: + if returnDevice.value == None: with deviceAvailableCV: deviceAvailableCV.wait() - if returnDevice.value is None: + if returnDevice.value == None: raise self._ChipStack.ErrorToException(CHIP_ERROR_INTERNAL) return returnDevice diff --git a/src/controller/python/chip/ChipStack.py b/src/controller/python/chip/ChipStack.py index 6a488871b340cf..dc3930cf046ad5 100644 --- a/src/controller/python/chip/ChipStack.py +++ b/src/controller/python/chip/ChipStack.py @@ -33,7 +33,7 @@ import platform import logging from threading import Lock, Event, Condition -from ctypes import * # lgtm [py/polluting-import] +from ctypes import * from .ChipUtility import ChipUtility from .exceptions import * diff --git a/src/controller/python/chip/ChipUtility.py b/src/controller/python/chip/ChipUtility.py index 26df956e93786d..5f34984f904a0f 100644 --- a/src/controller/python/chip/ChipUtility.py +++ b/src/controller/python/chip/ChipUtility.py @@ -24,7 +24,7 @@ from __future__ import absolute_import from __future__ import print_function import binascii -from ctypes import c_void_p, c_byte +from ctypes import * class ChipUtility(object): diff --git a/src/controller/python/chip/ble/library_handle.py b/src/controller/python/chip/ble/library_handle.py index 591fdb5a07428a..d2469716adb3b5 100644 --- a/src/controller/python/chip/ble/library_handle.py +++ b/src/controller/python/chip/ble/library_handle.py @@ -15,7 +15,7 @@ # import chip.native -import ctypes # lgtm [py/import-and-import-from] +import ctypes from ctypes import c_bool, c_void_p, c_char_p, c_uint32, py_object from chip.ble.types import DeviceScannedCallback, ScanDoneCallback diff --git a/src/controller/python/chip/clusters/Command.py b/src/controller/python/chip/clusters/Command.py index 8e1c2d037923bd..179c4ed9959da1 100644 --- a/src/controller/python/chip/clusters/Command.py +++ b/src/controller/python/chip/clusters/Command.py @@ -16,7 +16,7 @@ # from asyncio.futures import Future -import ctypes # lgtm [py/import-and-import-from] +import ctypes from dataclasses import dataclass from typing import Type from ctypes import CFUNCTYPE, c_char_p, c_size_t, c_void_p, c_uint32, c_uint16, c_uint8, py_object @@ -74,7 +74,7 @@ def _handleResponse(self, path: CommandPath, status: Status, response: bytes): self._future.set_result(None) else: # If a type hasn't been assigned, let's auto-deduce it. - if (self._expect_type is None): + if (self._expect_type == None): self._expect_type = FindCommandClusterObject(False, path) if self._expect_type: diff --git a/src/controller/python/chip/clusters/__init__.py b/src/controller/python/chip/clusters/__init__.py index 09daf6fc758d32..dee5aa9d605a23 100644 --- a/src/controller/python/chip/clusters/__init__.py +++ b/src/controller/python/chip/clusters/__init__.py @@ -23,5 +23,5 @@ """Provides Python APIs for CHIP.""" from . import Command from . import Attribute -from .Objects import * # lgtm [py/polluting-import] +from .Objects import * from . import CHIPClusters diff --git a/src/controller/python/chip/interaction_model/__init__.py b/src/controller/python/chip/interaction_model/__init__.py index 171c4bde89ef6d..60d63c2c8654d2 100644 --- a/src/controller/python/chip/interaction_model/__init__.py +++ b/src/controller/python/chip/interaction_model/__init__.py @@ -26,7 +26,7 @@ from chip.exceptions import ChipStackException -__all__ = ["Status", "InteractionModelError"] +__all__ = ["IMDelegate", "Status", "InteractionModelError"] class Status(enum.IntEnum): diff --git a/src/controller/python/chip/interaction_model/delegate.py b/src/controller/python/chip/interaction_model/delegate.py index ea30d38625d9dd..f8205dd0e7cde6 100644 --- a/src/controller/python/chip/interaction_model/delegate.py +++ b/src/controller/python/chip/interaction_model/delegate.py @@ -17,7 +17,7 @@ from abc import abstractmethod from construct import Struct, Int64ul, Int32ul, Int16ul, Int8ul from ctypes import CFUNCTYPE, c_void_p, c_uint32, c_uint64, c_uint8, c_uint16, c_ssize_t -import ctypes # lgtm [py/import-and-import-from] +import ctypes import chip.native import threading import chip.tlv