Merge lp:~verterok/unity-scope-openclipart/fix-metadata-published-key into lp:unity-scope-openclipart

[Guillermo Gonzalez]

Use 'updated' key for the published metadata field if 'published' isn't there.

Use 'updated' key for the published metadata field if 'published' isn't there.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-raring-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-raring-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-raring-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-openclipart-ci/5/rebuild

review: Approve (continuous-integration)

[lp:~verterok/unity-scope-openclipart/fix-metadata-published-key]

27. By Guillermo Gonzalez on 2013-05-22

support both published and updated keys (feedparser >= 5.1)

[David Callé (davidc3)]

LGTM +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-raring-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-raring-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-raring-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-openclipart-ci/6/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'src/unity_openclipart_daemon.py'
--- src/unity_openclipart_daemon.py	2013-04-23 15:32:59 +0000
+++ src/unity_openclipart_daemon.py	2013-05-22 20:47:29 +0000
@@ -2,16 +2,16 @@
 # -*- coding: utf-8 -*-
 
 # Copyright(C) 2013 Canonical, ltd.
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from gi.repository import Unity, UnityExtras
@@ -93,11 +93,16 @@
             for link in f['links']:
                 if link['rel'] == 'enclosure':
                     resource = link['href']
+            if 'published' not in f:
+                # support feedparser == 5.1
+                published = f['updated']
+            else:
+                published = f['published']
             results.append({'uri':f['link'],
                             'icon':f['media_thumbnail'][0]['url'],
                             'title':f['title'],
                             'comment':f['summary'],
-                            'published':f['published'],
+                            'published':published,
                             'author':f['author'],
                             'resource':resource})
         except Exception as error:
@@ -159,7 +164,7 @@
         icon = Gio.FileIcon.new (Gio.file_new_for_path(PROVIDER_ICON))
         view_action = Unity.PreviewAction.new("view", _("View"), icon)
         preview.add_action(view_action)
-        
+
         if resource and shutil.which("inkscape"):
             inkscape_action = Unity.PreviewAction.new("inkscape", _("Open in Inkscape"), None)
             preview.add_action(inkscape_action)
@@ -203,7 +208,7 @@
         '''
         fs = Unity.FilterSet.new ()
 #        if FILTERS:
-#            
+#
         return fs
 
     def do_get_group_name (self):