Skip to content

Commit e8aac78

Browse files
author
Sergio García Prado
committed
ISSUE #?
* Stop using `dir` builtin.
1 parent 7271bb8 commit e8aac78

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

packages/core/minos-microservice-common/minos/common/model/abc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def __getitem__(self, item: str) -> Any:
236236
raise KeyError(f"{type(self).__name__!r} does not contain the {item!r} field.")
237237

238238
def __setattr__(self, key: str, value: Any) -> None:
239-
if key.startswith("_") or key in dir(self):
239+
if key.startswith("_"):
240240
object.__setattr__(self, key, value)
241241
return
242242

@@ -246,7 +246,7 @@ def __setattr__(self, key: str, value: Any) -> None:
246246
raise AttributeError(str(exc))
247247

248248
def __getattr__(self, item: str) -> Any:
249-
if item.startswith("_") or item in dir(self):
249+
if item.startswith("_"):
250250
raise AttributeError(f"{type(self).__name__!r} does not contain the {item!r} attribute.")
251251

252252
try:

packages/core/minos-microservice-common/tests/test_common/test_model/test_declarative/test_common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ def test_setattr(self):
6969
def test_setattr_reserved_word(self):
7070
model = ReservedWordUser("foo")
7171
model.items = "bar"
72-
self.assertEqual("bar", model.items)
73-
self.assertNotEqual("bar", model.fields["items"].value)
72+
self.assertIsInstance(model.items, Callable)
73+
self.assertEqual("bar", model.fields["items"].value)
7474

7575
def test_setattr_raises(self):
7676
model = Customer(123)

packages/core/minos-microservice-saga/minos/saga/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __delitem__(self, item: str) -> None:
3838
raise KeyError(f"{type(self).__name__!r} does not contain the {item!r} field")
3939

4040
def __delattr__(self, item: str) -> None:
41-
if item.startswith("_") or item in dir(self):
41+
if item.startswith("_"):
4242
super().__delattr__(item)
4343
return
4444

packages/core/minos-microservice-saga/tests/test_saga/test_context.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import unittest
22
from collections.abc import (
3+
Callable,
34
MutableMapping,
45
)
56

@@ -36,8 +37,8 @@ def test_setter(self):
3637
def test_setter_reserved_word(self):
3738
context = SagaContext()
3839
context.items = "bar"
39-
self.assertEqual("bar", context.items)
40-
self.assertNotIn("bar", context.fields)
40+
self.assertIsInstance(context.items, Callable)
41+
self.assertEqual("bar", context["items"])
4142

4243
def test_deleter(self):
4344
context = SagaContext(one=1)
@@ -54,8 +55,8 @@ def test_deleter_attr(self):
5455
def test_deleter_reserved_word(self):
5556
context = SagaContext()
5657
context["items"] = "foo"
57-
with self.assertRaises(AttributeError):
58-
del context.items
58+
del context.items
59+
self.assertIsInstance(context.items, Callable)
5960
self.assertEqual("foo", context.fields["items"].value)
6061

6162
def test_deleter_raises(self):

0 commit comments

Comments
 (0)