Ubuntu Software Center

Merge lp:~aaronp/software-center/refactoring into lp:software-center

  1. refactoring
  2. Merge into trunk
Proposed by Aaron Peachey
Status: Merged
Merged at revision: 1784
Proposed branch: lp:~aaronp/software-center/refactoring
Merge into: lp:software-center
Diff against target: 113 lines (+9/-9)
8 files modified
softwarecenter/app.py (+1/-1)
softwarecenter/ui/gtk/appdetailsview.py (+1/-1)
softwarecenter/ui/gtk/appdetailsview_gtk.py (+1/-1)
softwarecenter/ui/gtk/appview.py (+1/-1)
softwarecenter/ui/gtk/models/appstore.py (+1/-1)
softwarecenter/ui/gtk/widgets/reviews.py (+2/-2)
test/test_reviews.py (+1/-1)
utils/submit_review.py (+1/-1)
To merge this branch: bzr merge lp:~aaronp/software-center/refactoring
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Michael Vogt Pending
Review via email: mp+61549@code.launchpad.net

Description of the change

moves softwarecenter/db/reviews.py to more appropriate location softwarecenter/backend/reviews.py and refactor other affected code

To post a comment you must log in.
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Looks great Aaron, thanks a lot for this! It's merged to trunk now. Note that I just made two small tweaks for the backend.reviews path rename, in POTFILES.in and in utils.py. Thanks again!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/app.py'
2--- softwarecenter/app.py 2011-05-17 09:30:01 +0000
3+++ softwarecenter/app.py 2011-05-19 12:12:02 +0000
4@@ -61,7 +61,7 @@
5 from paths import SOFTWARE_CENTER_ICON_CACHE_DIR
6
7 from plugin import PluginManager
8-from db.reviews import get_review_loader, UsefulnessCache
9+from backend.reviews import get_review_loader, UsefulnessCache
10 from distro import get_distro
11 from db.pkginfo import get_pkg_info
12 from gettext import gettext as _
13
14=== renamed file 'softwarecenter/db/reviews.py' => 'softwarecenter/backend/reviews.py'
15=== modified file 'softwarecenter/ui/gtk/appdetailsview.py'
16--- softwarecenter/ui/gtk/appdetailsview.py 2011-05-17 08:02:58 +0000
17+++ softwarecenter/ui/gtk/appdetailsview.py 2011-05-19 12:12:02 +0000
18@@ -25,7 +25,7 @@
19 import gobject
20
21 from softwarecenter.db.application import AppDetails
22-from softwarecenter.db.reviews import get_review_loader
23+from softwarecenter.backend.reviews import get_review_loader
24 from softwarecenter.backend import get_install_backend
25 from softwarecenter.enums import *
26 from softwarecenter.utils import get_current_arch, get_parent_xid, get_language
27
28=== modified file 'softwarecenter/ui/gtk/appdetailsview_gtk.py'
29--- softwarecenter/ui/gtk/appdetailsview_gtk.py 2011-05-18 01:53:20 +0000
30+++ softwarecenter/ui/gtk/appdetailsview_gtk.py 2011-05-19 12:12:02 +0000
31@@ -40,7 +40,7 @@
32 from softwarecenter.backend import get_install_backend
33
34 from softwarecenter.db.application import Application
35-from softwarecenter.db.reviews import ReviewStats
36+from softwarecenter.backend.reviews import ReviewStats
37
38 from softwarecenter.backend.zeitgeist_simple import zeitgeist_singleton
39 from softwarecenter.enums import *
40
41=== modified file 'softwarecenter/ui/gtk/appview.py'
42--- softwarecenter/ui/gtk/appview.py 2011-05-18 01:37:40 +0000
43+++ softwarecenter/ui/gtk/appview.py 2011-05-19 12:12:02 +0000
44@@ -36,7 +36,7 @@
45
46 from softwarecenter.netstatus import NetState, get_network_state, get_network_watcher
47
48-#from softwarecenter.db.reviews import get_review_loader
49+#from softwarecenter.backend.reviews import get_review_loader
50 #from softwarecenter.backend import get_install_backend
51 #from softwarecenter.paths import SOFTWARE_CENTER_ICON_CACHE_DIR
52
53
54=== modified file 'softwarecenter/ui/gtk/models/appstore.py'
55--- softwarecenter/ui/gtk/models/appstore.py 2011-05-18 01:33:53 +0000
56+++ softwarecenter/ui/gtk/models/appstore.py 2011-05-19 12:12:02 +0000
57@@ -30,7 +30,7 @@
58 from softwarecenter.enums import *
59 from softwarecenter.utils import *
60 from softwarecenter.backend import get_install_backend
61-from softwarecenter.db.reviews import get_review_loader
62+from softwarecenter.backend.reviews import get_review_loader
63 from softwarecenter.db.database import Application, SearchQuery, LocaleSorter
64
65 from softwarecenter.distro import get_distro
66
67=== modified file 'softwarecenter/ui/gtk/widgets/reviews.py'
68--- softwarecenter/ui/gtk/widgets/reviews.py 2011-05-18 01:53:20 +0000
69+++ softwarecenter/ui/gtk/widgets/reviews.py 2011-05-19 12:12:02 +0000
70@@ -44,7 +44,7 @@
71
72 from softwarecenter.enums import *
73
74-from softwarecenter.db.reviews import UsefulnessCache
75+from softwarecenter.backend.reviews import UsefulnessCache
76
77 LOG_ALLOCATION = logging.getLogger("softwarecenter.ui.gtk.allocation")
78
79@@ -730,7 +730,7 @@
80 self.logged_in_person = get_person_from_config()
81
82 self._parent = parent
83- # this is a list of review data (softwarecenter.db.reviews.Review)
84+ # this is a list of review data (softwarecenter.backend.reviews.Review)
85 self.reviews = []
86 self.useful_votes = UsefulnessCache()
87 self.logged_in_person = None
88
89=== modified file 'test/test_reviews.py'
90--- test/test_reviews.py 2011-05-10 07:20:04 +0000
91+++ test/test_reviews.py 2011-05-19 12:12:02 +0000
92@@ -6,7 +6,7 @@
93 sys.path.insert(0,"../")
94 from softwarecenter.utils import *
95 from softwarecenter.db.application import Application
96-from softwarecenter.db.reviews import Review
97+from softwarecenter.backend.reviews import Review
98
99 sys.path.insert(0, "../utils")
100
101
102=== modified file 'utils/submit_review.py'
103--- utils/submit_review.py 2011-05-17 08:08:10 +0000
104+++ utils/submit_review.py 2011-05-19 12:12:02 +0000
105@@ -51,7 +51,7 @@
106 from softwarecenter.config import get_config
107 from softwarecenter.backend.login_sso import LoginBackendDbusSSO
108 from softwarecenter.db.database import Application
109-from softwarecenter.db.reviews import Review
110+from softwarecenter.backend.reviews import Review
111 from softwarecenter.utils import get_current_arch, clear_token_from_ubuntu_sso, get_language
112 from softwarecenter.ui.gtk.SimpleGtkbuilderApp import SimpleGtkbuilderApp
113 from softwarecenter.ui.gtk.dialogs import SimpleGtkbuilderDialog

Subscribers

People subscribed via source and target branches