Fix mypy typing issues and run black format

wechatpy · Jan 15, 2021 · c8aef25 · c8aef25
1 parent 0755e86
commit c8aef25
Show file tree

Hide file tree

Showing 51 changed files with 1,054 additions and 229 deletions.
diff --git a/wechatpy/client/__init__.py b/wechatpy/client/__init__.py
@@ -43,7 +43,13 @@ class WeChatClient(BaseWeChatClient):
     cloud = api.WeChatCloud()
 
     def __init__(
-        self, appid, secret, access_token=None, session=None, timeout=None, auto_retry=True,
+        self,
+        appid,
+        secret,
+        access_token=None,
+        session=None,
+        timeout=None,
+        auto_retry=True,
     ):
         super().__init__(appid, access_token, session, timeout, auto_retry)
         self.appid = appid
@@ -59,7 +65,11 @@ def fetch_access_token(self):
         """
         return self._fetch_access_token(
             url="https://api.weixin.qq.com/cgi-bin/token",
-            params={"grant_type": "client_credential", "appid": self.appid, "secret": self.secret,},
+            params={
+                "grant_type": "client_credential",
+                "appid": self.appid,
+                "secret": self.secret,
+            },
         )
 
 
@@ -70,7 +80,13 @@ class WeChatComponentClient(WeChatClient):
     """
 
     def __init__(
-        self, appid, component, access_token=None, refresh_token=None, session=None, timeout=None,
+        self,
+        appid,
+        component,
+        access_token=None,
+        refresh_token=None,
+        session=None,
+        timeout=None,
     ):
         # 未用到secret，所以这里没有
         super().__init__(appid, "", "", session, timeout)

diff --git a/wechatpy/client/api/card.py b/wechatpy/client/api/card.py
@@ -26,7 +26,9 @@ def batch_add_locations(self, location_data):
         :return: 门店 ID 列表，插入失败的门店元素值为 -1
         """
         result = self._post(
-            "card/location/batchadd", data=location_data, result_processor=lambda x: x["location_id_list"],
+            "card/location/batchadd",
+            data=location_data,
+            result_processor=lambda x: x["location_id_list"],
         )
         return result
 
@@ -51,7 +53,11 @@ def create_qrcode(self, qrcode_data):
         :param qrcode_data: 二维码信息
         :return: 二维码 ticket，可使用 :func:show_qrcode 换取二维码文件
         """
-        result = self._post("card/qrcode/create", data=qrcode_data, result_processor=lambda x: x["ticket"],)
+        result = self._post(
+            "card/qrcode/create",
+            data=qrcode_data,
+            result_processor=lambda x: x["ticket"],
+        )
         return result
 
     def create_landingpage(self, buffer_data):
@@ -65,7 +71,11 @@ def get_html(self, card_id):
         """
         图文消息群发卡券
         """
-        result = self._post("card/mpnews/gethtml", data={"card_id": card_id}, result_processor=lambda x: x["content"],)
+        result = self._post(
+            "card/mpnews/gethtml",
+            data={"card_id": card_id},
+            result_processor=lambda x: x["content"],
+        )
         return result
 
     def consume_code(self, code, card_id=None):
@@ -82,7 +92,9 @@ def decrypt_code(self, encrypt_code):
         解码加密的 code
         """
         result = self._post(
-            "card/code/decrypt", data={"encrypt_code": encrypt_code}, result_processor=lambda x: x["code"],
+            "card/code/decrypt",
+            data={"encrypt_code": encrypt_code},
+            result_processor=lambda x: x["code"],
         )
         return result
 
@@ -132,7 +144,10 @@ def update_code(self, card_id, old_code, new_code):
         """
         更新卡券 code
         """
-        return self._post("card/code/update", data={"card_id": card_id, "code": old_code, "new_code": new_code},)
+        return self._post(
+            "card/code/update",
+            data={"card_id": card_id, "code": old_code, "new_code": new_code},
+        )
 
     def invalid_code(self, code, card_id=None):
         """
@@ -241,7 +256,10 @@ def update_membercard(self, code, card_id, **kwargs):
         :return: 参见返回示例
         """
         kwargs.update(
-            {"code": code, "card_id": card_id,}
+            {
+                "code": code,
+                "card_id": card_id,
+            }
         )
         return self._post("card/membercard/updateuser", data=kwargs)
 
@@ -255,7 +273,13 @@ def get_membercard_user_info(self, card_id, code):
         :param code: 所查询用户领取到的 code 值
         :return: 会员信息，包括激活资料、积分信息以及余额等信息
         """
-        return self._post("card/membercard/userinfo/get", data={"card_id": card_id, "code": code,},)
+        return self._post(
+            "card/membercard/userinfo/get",
+            data={
+                "card_id": card_id,
+                "code": code,
+            },
+        )
 
     def add_pay_giftcard(self, base_info, extra_info, is_membercard):
         """
@@ -279,7 +303,13 @@ def add_pay_giftcard(self, base_info, extra_info, is_membercard):
             rule_type = "RULE_TYPE_SINGLE_PAY"
         return self._post(
             "card/paygiftcard/add",
-            data={"rule_info": {"type": rule_type, "base_info": base_info, rule_key: extra_info,}},
+            data={
+                "rule_info": {
+                    "type": rule_type,
+                    "base_info": base_info,
+                    rule_key: extra_info,
+                }
+            },
         )
 
     def del_pay_giftcard(self, rule_id):
@@ -290,7 +320,12 @@ def del_pay_giftcard(self, rule_id):
 
         :param rule_id: 支付即会员的规则 ID
         """
-        return self._post("card/paygiftcard/delete", data={"rule_id": rule_id,},)
+        return self._post(
+            "card/paygiftcard/delete",
+            data={
+                "rule_id": rule_id,
+            },
+        )
 
     def get_pay_giftcard(self, rule_id):
         """
@@ -303,7 +338,11 @@ def get_pay_giftcard(self, rule_id):
         :rtype: dict
         """
         return self._post(
-            "card/paygiftcard/getbyid", data={"rule_id": rule_id,}, result_processor=lambda x: x["rule_info"],
+            "card/paygiftcard/getbyid",
+            data={
+                "rule_id": rule_id,
+            },
+            result_processor=lambda x: x["rule_info"],
         )
 
     def batch_get_pay_giftcard(self, effective=True, offset=0, count=10):
@@ -323,11 +362,23 @@ def batch_get_pay_giftcard(self, effective=True, offset=0, count=10):
         """
         return self._post(
             "card/paygiftcard/batchget",
-            data={"type": "RULE_TYPE_PAY_MEMBER_CARD", "effective": effective, "offset": offset, "count": count,},
+            data={
+                "type": "RULE_TYPE_PAY_MEMBER_CARD",
+                "effective": effective,
+                "offset": offset,
+                "count": count,
+            },
         )
 
     def update_movie_ticket(
-        self, code, ticket_class, show_time, duration, screening_room, seat_number, card_id=None,
+        self,
+        code,
+        ticket_class,
+        show_time,
+        duration,
+        screening_room,
+        seat_number,
+        card_id=None,
     ):
         """
         更新电影票
@@ -452,7 +503,10 @@ def get_activate_url(self, card_id, outer_str=None):
         """
         return self._post(
             "card/membercard/activate/geturl",
-            data={"card_id": card_id, "outer_str": outer_str,},
+            data={
+                "card_id": card_id,
+                "outer_str": outer_str,
+            },
             result_processor=lambda x: x["url"],
         )
 
@@ -467,7 +521,9 @@ def get_activate_info(self, activate_ticket):
         """
         return self._post(
             "card/membercard/activatetempinfo/get",
-            data={"activate_ticket": activate_ticket,},
+            data={
+                "activate_ticket": activate_ticket,
+            },
             result_processor=lambda x: x["info"],
         )