Merge lp:~submarine/ubuntu-scopes/openweathermap-dont-reorder into lp:~submarine/ubuntu-scopes/openweathermap

[David Callé]

Remove results re-ordering, which was introduced as a workaround for an early display issue.

Remove results re-ordering, which was introduced as a workaround for an early display issue.

[David Callé (davidc3)]

Remove results re-ordering, which was introduced as a workaround for an early display issue.

[James Henstridge (jamesh)]

I'm kind of surprised that the test suite passes with this change. It looks like it is testing the first result, which this branch is changing. Or was this code path not hit by the existing tests?

review: Needs Information

[David Callé (davidc3)]

The mock data set only produces two results.

[James Henstridge (jamesh)]

I guess without this reordering code, that should be enough: deleting an untested code path is fine with me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/unity_openweathermap_daemon.py'
--- src/unity_openweathermap_daemon.py	2013-03-19 22:27:09 +0000
+++ src/unity_openweathermap_daemon.py	2013-03-20 23:02:22 +0000
@@ -152,8 +152,6 @@
                         'icon':icon,
                         'title':title,
                         'comment':description})
-    if len(results) == 5:
-        results.insert(0, results.pop(4))
     return results