Skip to content

Re-fetch access_token when it is out of date. Fix some syntax mistakes. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Re-fetch access_token when it is out of date. Fix some syntax mistakes. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wechat/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ class WxCompoundResponse(WxResponse):

def __init__(self, data, request):
super(WxCompoundResponse, self).__init__(request)
self.data
self.data = data

def content_nodes(self, doc):
return self.fields2elements(self.data, self.Tag, doc)
return fields2elements(self.data, self.Tag, doc)


class WxImageResponse(WxCompoundResponse):
Expand Down
38 changes: 23 additions & 15 deletions wechat/official.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ def access_token(self):
return None
return self._access_token

def set_access_token(self, token):
@access_token.setter
def access_token(self, token):
self._access_token = token

def _process_response(self, rsp):
Expand Down Expand Up @@ -279,25 +280,32 @@ def download_media(self, media_id, to_path, url='media/get'):
else:
return None, APIError(rsp.status_code, 'http error')

def _get_media_id(self, obj, resource, content_type):
if not obj.get(resource + '_id'):
rsp, err = None, None
if obj.get(resource + '_content'):
rsp, err = self.upload_media(
content_type,
file_content=obj.get(resource + '_content'))
if err:
return None
elif obj.get(resource + '_url'):
rs = requests.get(obj.get(resource + '_url'))
def _upload_media(self, obj, resource, content_type, path_type):
rsp, err = None, None
resource_path = resource + '_' + path_type
if obj.get(resource_path):
rsp, err = self.upload_media(
content_type,
file_content=obj.get(resource_path))
if err:
# access_token有效期为3小时，可能因为失效而导致上传失败，在这里重新获取一次
self.access_token = None
rsp, err = self.upload_media(
content_type,
file_content=rs.content)
file_path=obj.get(resource_path))
if err:
return None
else:
return None
return rsp['media_id']
return None

def _get_media_id(self, obj, resource, content_type):
if not obj.get(resource + '_id'):
mid = None
for path_type in ['content', 'url', 'path']:
mid = self._upload_media(obj, resource, content_type, path_type)
if mid:
return mid
return mid
return obj.get(resource + '_id')


Expand Down