Update APIDescriptor

wechatpy/client/api/base.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
+import weakref
 
 
 class APIDescriptor(object):
@@ -8,6 +9,9 @@ def __init__(self, api):
         self.api = api
 
     def __get__(self, instance, instance_type=None):
+        if instance is not None:
+            if self.api._client is None:
+                self.api._client = weakref.proxy(instance)
         return self.api
 
 
@@ -32,3 +36,4 @@ def access_token(self):
 
     def add_to_class(self, klass, name):
         klass._api_endpoints[name] = self
+        setattr(klass, name, APIDescriptor(self))

wechatpy/client/base.py

@@ -2,7 +2,6 @@
 from __future__ import absolute_import, unicode_literals
 import time
 import copy
-import weakref
 
 import six
 import requests
@@ -23,7 +22,7 @@ def __new__(cls, name, bases, attrs):
                 if k in attrs:
                     continue
                 if isinstance(v, APIDescriptor):
-                    attrs[k] = copy.deepcopy(v.api)
+                    attrs[k] = copy.deepcopy(v)
 
         cls = super(_ClientMetaClass, cls).__new__(cls, name, bases, attrs)
         cls._api_endpoints = {}
@@ -42,13 +41,6 @@ def __init__(self, access_token=None):
         self._access_token = access_token
         self.expires_at = None
 
-        weak_self = weakref.proxy(self)
-        for name, api in self._api_endpoints.items():
-            if not isinstance(api, BaseWeChatAPI):
-                continue
-            api._client = weak_self
-            setattr(self, name, api)
-
     def _request(self, method, url_or_endpoint, **kwargs):
         if not url_or_endpoint.startswith(('http://', 'https://')):
             api_base_url = kwargs.pop('api_base_url', self.API_BASE_URL)