Merge pull request #23 from cloverstd/master

Add missing `media_id` in `ImageMessage`, fix #22 . Thanks @cloverstd
wechatpy · Jan 12, 2015 · 28fd671 · 28fd671
2 parents 3229745 + a8c7b65
commit 28fd671
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/wechatpy/events.py b/wechatpy/events.py
@@ -182,10 +182,12 @@ def count(self):
 
     @property
     def pictures(self):
-        items = self.pictures_info['PicList']['item']
-        if self.count > 1:
-            return items
-        return [items]
+        if self.pictures_info['PicList']:
+            items = self.pictures_info['PicList']['item']
+            if self.count > 1:
+                return items
+            return [items]
+        return []
 
 
 @register_event('pic_sysphoto')

diff --git a/wechatpy/messages.py b/wechatpy/messages.py
@@ -89,6 +89,7 @@ class ImageMessage(BaseMessage):
     http://mp.weixin.qq.com/wiki/10/79502792eef98d6e0c6e1739da387346.html
     """
     type = 'image'
+    media_id = StringField('MediaId')
     image = StringField('PicUrl')