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

[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:64
http://jenkins.qa.ubuntu.com/job/unity-scope-googlenews-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-googlenews-raring-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-googlenews-raring-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-googlenews-raring-i386-ci/1

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

review: Approve (continuous-integration)

[David Callé (davidc3)]

LGTM +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scope-googlenews-autolanding/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-googlenews-raring-amd64-autolanding/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-googlenews-raring-armhf-autolanding/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-googlenews-raring-i386-autolanding/2

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/unity_googlenews_daemon.py'
--- src/unity_googlenews_daemon.py	2013-04-25 22:23:11 +0000
+++ src/unity_googlenews_daemon.py	2013-05-22 20:46:27 +0000
@@ -2,16 +2,16 @@
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2013 David Callé <[e-mail]>
-# 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
@@ -51,7 +51,7 @@
       'name'    :_('Local'),
       'icon'    :SVG_DIR+'group-news.svg',
       'renderer':Unity.CategoryRenderer.VERTICAL_TILE}
-c2 = {'id'      :'top', 
+c2 = {'id'      :'top',
       'name'    :_('Top Stories'),
       'icon'    :SVG_DIR+'group-news.svg',
       'renderer':Unity.CategoryRenderer.VERTICAL_TILE}
@@ -141,13 +141,19 @@
                 img = img.replace('/0.jpg', '/1.jpg')
             else:
                 img = None
+            if 'published' not in f:
+                # support feedparser == 5.1
+                published = f['updated']
+            else:
+                published = f['published']
+
             results.append({'uri':f['link'],
                             'icon':img,
                             'category':cat,
                             'comment':f['summary'],
                             'title':f['title'],
                             'language':country,
-                            'published':f['published']})
+                            'published':published})
     return results
 
 
@@ -254,7 +260,7 @@
         '''
         fs = Unity.FilterSet.new ()
 #        if FILTERS:
-#            
+#
         return fs
 
     def do_get_group_name (self):