Ubuntu Software Center

Merge lp:~kamstrup/software-center/fix-topapps-util into lp:software-center

  1. fix-topapps-util
  2. Merge into trunk
Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Merged at revision: 2404
Proposed branch: lp:~kamstrup/software-center/fix-topapps-util
Merge into: lp:software-center
Diff against target: 30 lines (+5/-8)
1 file modified
utils/topapps.py (+5/-8)
To merge this branch: bzr merge lp:~kamstrup/software-center/fix-topapps-util
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+76343@code.launchpad.net

Description of the change

The utils/topapps.py script was not ported to the new API in softwarecenter.enums

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utils/topapps.py'
2--- utils/topapps.py 2011-05-18 07:44:26 +0000
3+++ utils/topapps.py 2011-09-21 07:50:27 +0000
4@@ -6,10 +6,7 @@
5 import xapian
6
7 sys.path.insert(0, "../")
8-from softwarecenter.enums import (XAPIAN_VALUE_PKGNAME,
9- XAPIAN_VALUE_APPNAME,
10- XAPIAN_VALUE_SUMMARY,
11- XAPIAN_VALUE_POPCON)
12+from softwarecenter.enums import XapianValues
13 from softwarecenter.paths import XAPIAN_BASE_PATH
14
15 if __name__ == "__main__":
16@@ -24,10 +21,10 @@
17 heap = []
18 for m in db.postlist(""):
19 doc = db.get_document(m.docid)
20- pkgname = doc.get_value(XAPIAN_VALUE_PKGNAME)
21- appname = doc.get_value(XAPIAN_VALUE_APPNAME)
22- summary = doc.get_value(XAPIAN_VALUE_SUMMARY)
23- popcon = xapian.sortable_unserialise(doc.get_value(XAPIAN_VALUE_POPCON))
24+ pkgname = doc.get_value(XapianValues.PKGNAME)
25+ appname = doc.get_value(XapianValues.APPNAME)
26+ summary = doc.get_value(XapianValues.SUMMARY)
27+ popcon = xapian.sortable_unserialise(doc.get_value(XapianValues.POPCON))
28 heapq.heappush(heap, (popcon, appname, pkgname, summary))
29
30 for (popcon, appname, pkgname, summary) in heapq.nlargest(topn, heap):