upgrade attrs to 20.3.0 and update converter kwarg

mahenzon · Feb 24, 2021 · f4f51df · f4f51df
1 parent cc15868
commit f4f51df
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/aioalice/types/alice_request.py b/aioalice/types/alice_request.py
@@ -18,9 +18,9 @@
 class AliceRequest(AliceObject):
     """AliceRequest is a request from Alice API"""
     original_request = attrib(type=WebRequest)
-    meta = attrib(convert=ensure_cls(Meta))
-    request = attrib(convert=ensure_cls(Request))
-    session = attrib(convert=ensure_cls(Session))
+    meta = attrib(converter=ensure_cls(Meta))
+    request = attrib(converter=ensure_cls(Request))
+    session = attrib(converter=ensure_cls(Session))
     version = attrib(type=str)
 
     def _response(self, response):

diff --git a/aioalice/types/alice_response.py b/aioalice/types/alice_response.py
@@ -8,6 +8,6 @@
 class AliceResponse(AliceObject):
     """AliceResponse is a response to Alice API"""
 
-    response = attrib(convert=ensure_cls(Response))
-    session = attrib(convert=ensure_cls(BaseSession))
+    response = attrib(converter=ensure_cls(Response))
+    session = attrib(converter=ensure_cls(BaseSession))
     version = attrib(type=str)
diff --git a/aioalice/types/card.py b/aioalice/types/card.py
@@ -15,13 +15,13 @@ class Card(AliceObject):
     image_id = attrib(default=None, type=str)
     title = attrib(default=None, type=str)
     description = attrib(default=None, type=str)
-    button = attrib(default=None, convert=ensure_cls(MediaButton))
+    button = attrib(default=None, converter=ensure_cls(MediaButton))
 
     # for ItemsList
-    header = attrib(default=None, convert=ensure_cls(CardHeader))
-    items = attrib(default=None, convert=ensure_cls(Image))  # List of Image objects
+    header = attrib(default=None, converter=ensure_cls(CardHeader))
+    items = attrib(default=None, converter=ensure_cls(Image))  # List of Image objects
 
-    footer = attrib(default=None, convert=ensure_cls(CardFooter))
+    footer = attrib(default=None, converter=ensure_cls(CardFooter))
 
     @type.validator
     def check(self, attribute, value):

diff --git a/aioalice/types/card_footer.py b/aioalice/types/card_footer.py
@@ -8,4 +8,4 @@
 class CardFooter(AliceObject):
     """This object represents a card's footer"""
     text = attrib(type=str)
-    button = attrib(default=None, convert=ensure_cls(MediaButton))
+    button = attrib(default=None, converter=ensure_cls(MediaButton))
diff --git a/aioalice/types/entity.py b/aioalice/types/entity.py
@@ -12,7 +12,7 @@
 class Entity(AliceObject):
     """Entity object"""
     type = attrib(type=str)
-    tokens = attrib(convert=ensure_cls(EntityTokens))
+    tokens = attrib(converter=ensure_cls(EntityTokens))
     value = attrib(factory=dict)
 
     @type.validator

diff --git a/aioalice/types/image.py b/aioalice/types/image.py
@@ -10,4 +10,4 @@ class Image(AliceObject):
     image_id = attrib(type=str)
     title = attrib(type=str)
     description = attrib(type=str)
-    button = attrib(default=None, convert=ensure_cls(MediaButton))
+    button = attrib(default=None, converter=ensure_cls(MediaButton))
diff --git a/aioalice/types/meta.py b/aioalice/types/meta.py
@@ -10,5 +10,5 @@ class Meta(AliceObject):
     locale = attrib(type=str)
     timezone = attrib(type=str)
     client_id = attrib(type=str)
-    interfaces = attrib(default=None, convert=ensure_cls(Interfaces))
+    interfaces = attrib(default=None, converter=ensure_cls(Interfaces))
     flags = attrib(factory=list)
diff --git a/aioalice/types/natural_language_understanding.py b/aioalice/types/natural_language_understanding.py
@@ -12,4 +12,4 @@
 class NaturalLanguageUnderstanding(AliceObject):
     """Natural Language Understanding object"""
     tokens = attrib(factory=list)
-    entities = attrib(factory=list, convert=ensure_cls(Entity))
+    entities = attrib(factory=list, converter=ensure_cls(Entity))
diff --git a/aioalice/types/request.py b/aioalice/types/request.py
@@ -13,7 +13,7 @@ class Request(AliceObject):
     original_utterance = attrib(default='', type=str)  # Can be none if payload passed
     markup = attrib(default=None)
     payload = attrib(default=None)
-    nlu = attrib(default=None, convert=ensure_cls(NaturalLanguageUnderstanding))
+    nlu = attrib(default=None, converter=ensure_cls(NaturalLanguageUnderstanding))
 
     @type.validator
     def check(self, attribute, value):

diff --git a/aioalice/types/response.py b/aioalice/types/response.py
@@ -10,6 +10,6 @@ class Response(AliceObject):
 
     text = attrib(type=str)
     tts = attrib(default=None, type=str)
-    card = attrib(default=None, convert=ensure_cls(Card))
-    buttons = attrib(default=None, convert=ensure_cls(Button))
+    card = attrib(default=None, converter=ensure_cls(Card))
+    buttons = attrib(default=None, converter=ensure_cls(Button))
     end_session = attrib(default=False, type=bool)
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 aiohttp>=3.3.2
-attrs==18.1.0
+attrs==20.3.0