diff options
author | Lance Stout <lancestout@gmail.com> | 2012-10-15 22:27:30 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-10-15 22:27:30 -0700 |
commit | 77f2a339e1626501a1df388050f09342d7bbcd1d (patch) | |
tree | 7ea3d3889628bd2509797a7069de0560a2c6252c /sleekxmpp/plugins/xep_0084/avatar.py | |
parent | 7c485c6a8b25b97c7faa4abda6e82200bd09bcae (diff) | |
parent | 4190027a787f878b4ea07ddd24883bb9d1a94d6e (diff) | |
download | slixmpp-77f2a339e1626501a1df388050f09342d7bbcd1d.tar.gz slixmpp-77f2a339e1626501a1df388050f09342d7bbcd1d.tar.bz2 slixmpp-77f2a339e1626501a1df388050f09342d7bbcd1d.tar.xz slixmpp-77f2a339e1626501a1df388050f09342d7bbcd1d.zip |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0084/avatar.py')
-rw-r--r-- | sleekxmpp/plugins/xep_0084/avatar.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/xep_0084/avatar.py b/sleekxmpp/plugins/xep_0084/avatar.py index 03711871..2454afc7 100644 --- a/sleekxmpp/plugins/xep_0084/avatar.py +++ b/sleekxmpp/plugins/xep_0084/avatar.py @@ -69,6 +69,8 @@ class XEP_0084(BasePlugin): metadata = MetaData() if items is None: items = [] + if not isinstance(items, (list, set)): + items = [items] for info in items: metadata.add_info(info['id'], info['type'], info['bytes'], height=info.get('height', ''), |