ref: Update flake8-bugbear

Author: untitaker

.flake8

@@ -1,5 +1,5 @@
 [flake8]
-ignore = E203, E266, E501, W503, E402, E731, C901, B950
+ignore = E203, E266, E501, W503, E402, E731, C901, B950, B011
 max-line-length = 80
 max-complexity = 18
 select = B,C,E,F,W,T4,B9

sentry_sdk/_compat.py

@@ -60,7 +60,7 @@ def reraise(tp, value, tb=None):
 def with_metaclass(meta, *bases):
     # type: (Any, *Any) -> Any
     class metaclass(type):
-        def __new__(cls, name, this_bases, d):
+        def __new__(metacls, name, this_bases, d):
             # type: (Any, Any, Any, Any) -> Any
             return meta(name, bases, d)
 

sentry_sdk/consts.py

@@ -28,17 +28,17 @@ def __init__(
         environment=None,  # type: Optional[str]
         server_name=None,  # type: Optional[str]
         shutdown_timeout=2,  # type: int
-        integrations=[],  # type: Sequence[Integration]
-        in_app_include=[],  # type: List[str]
-        in_app_exclude=[],  # type: List[str]
+        integrations=[],  # type: Sequence[Integration]  # noqa: B006
+        in_app_include=[],  # type: List[str]  # noqa: B006
+        in_app_exclude=[],  # type: List[str]  # noqa: B006
         default_integrations=True,  # type: bool
         dist=None,  # type: Optional[str]
         transport=None,  # type: Optional[Union[Transport, Type[Transport], Callable[[Event], None]]]
         sample_rate=1.0,  # type: float
         send_default_pii=False,  # type: bool
         http_proxy=None,  # type: Optional[str]
         https_proxy=None,  # type: Optional[str]
-        ignore_errors=[],  # type: List[Union[type, str]]
+        ignore_errors=[],  # type: List[Union[type, str]]  # noqa: B006
         request_bodies="medium",  # type: str
         before_send=None,  # type: Optional[EventProcessor]
         before_breadcrumb=None,  # type: Optional[BreadcrumbProcessor]
@@ -49,7 +49,7 @@ def __init__(
         # DO NOT ENABLE THIS RIGHT NOW UNLESS YOU WANT TO EXCEED YOUR EVENT QUOTA IMMEDIATELY
         traces_sample_rate=0.0,  # type: float
         traceparent_v2=False,  # type: bool
-        _experiments={},  # type: Dict[str, Any]
+        _experiments={},  # type: Dict[str, Any]  # noqa: B006
     ):
         # type: (...) -> None
         pass

sentry_sdk/hub.py

@@ -1,11 +1,9 @@
 import copy
 import random
 import sys
-import weakref
 
 from datetime import datetime
 from contextlib import contextmanager
-from warnings import warn
 
 from sentry_sdk._compat import with_metaclass
 from sentry_sdk.scope import Scope
@@ -109,7 +107,7 @@ class init(ClientConstructor, ContextManager[Any]):
 
 class HubMeta(type):
     @property
-    def current(self):
+    def current(cls):
         # type: () -> Hub
         """Returns the current instance of the hub."""
         rv = _local.get(None)
@@ -119,7 +117,7 @@ def current(self):
         return rv
 
     @property
-    def main(self):
+    def main(cls):
         # type: () -> Hub
         """Returns the main instance of the hub."""
         return GLOBAL_HUB

sentry_sdk/utils.py

@@ -208,6 +208,8 @@ def to_header(self, timestamp=None):
 
 
 class AnnotatedValue(object):
+    __slots__ = ("value", "metadata")
+
     def __init__(self, value, metadata):
         # type: (Optional[Any], Dict[str, Any]) -> None
         self.value = value
@@ -754,7 +756,7 @@ def get(self, default):
 
         def set(self, value):
             # type: (Any) -> None
-            setattr(self._local, "value", value)
+            self._local.value = value
 
     return False, ContextVar
 

tests/integrations/beam/test_beam.py

@@ -36,7 +36,7 @@ class A:
     def __init__(self, fn):
         self.r = "We are in A"
         self.fn = fn
-        setattr(self, "_inspect_fn", _wrap_inspect_call(self, "fn"))
+        self._inspect_fn = _wrap_inspect_call(self, "fn")
 
     def process(self):
         return self.fn()

tests/utils/test_transaction.py

@@ -2,7 +2,7 @@
 
 
 class MyClass:
-    def myfunc():
+    def myfunc(self):
         pass
 
 

tox.ini

@@ -155,9 +155,8 @@ deps =
     linters: flake8
     linters: flake8-import-order
     linters: mypy>=0.730
+    linters: flake8-bugbear>=19.8.0
 
-    # https://github.com/PyCQA/flake8-bugbear/pull/77
-    linters: git+https://github.com/untitaker/flake8-bugbear#branch=fix/b901-yield-expr
 setenv =
     PYTHONDONTWRITEBYTECODE=1
     TESTPATH=tests