Ubuntu Software Center

Merge lp:~mvo/software-center/py3-compat-for-license-keyhelper into lp:software-center

  1. py3-compat-for-license-keyhelper
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Merged at revision: 3197
Proposed branch: lp:~mvo/software-center/py3-compat-for-license-keyhelper
Merge into: lp:software-center
Diff against target: 247 lines (+18/-24)
19 files modified
softwarecenter/backend/__init__.py (+0/-6)
softwarecenter/backend/channel_impl/aptchannels.py (+1/-1)
softwarecenter/backend/piston/scaclient.py (+1/-1)
softwarecenter/db/application.py (+1/-1)
softwarecenter/ui/gtk3/app.py (+1/-1)
softwarecenter/ui/gtk3/aptd_gtk3.py (+1/-1)
softwarecenter/ui/gtk3/models/appstore2.py (+1/-1)
softwarecenter/ui/gtk3/models/pendingstore.py (+1/-1)
softwarecenter/ui/gtk3/panes/softwarepane.py (+1/-1)
softwarecenter/ui/gtk3/panes/viewswitcher.py (+1/-1)
softwarecenter/ui/gtk3/views/appdetailsview.py (+1/-1)
softwarecenter/ui/gtk3/views/purchaseview.py (+1/-1)
softwarecenter/ui/gtk3/widgets/apptreeview.py (+1/-1)
softwarecenter/ui/gtk3/widgets/buttons.py (+1/-1)
softwarecenter/ui/gtk3/widgets/recommendations.py (+1/-1)
softwarecenter/ui/qml/pkglist.py (+1/-1)
tests/test_purchase_backend.py (+1/-1)
tests/test_testutils.py (+1/-1)
utils/update-software-center-channels (+1/-1)
To merge this branch: bzr merge lp:~mvo/software-center/py3-compat-for-license-keyhelper
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+125124@code.launchpad.net

Description of the change

This branch move the get_install_backend() import out of softwarecenter/backend/__init__.py and updates the rest of the tree to follow that. The rational is that the software-center-aptdaemon-plugin needs to be compatible with python3 and it imports softwarecenter.backend.piston.scagent. This import will (implicitely) import the get_install_backend code which in turn imports a whole lot more that is not quite python3 ready.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/backend/__init__.py'
2--- softwarecenter/backend/__init__.py 2012-03-19 13:35:47 +0000
3+++ softwarecenter/backend/__init__.py 2012-09-19 08:27:20 +0000
4@@ -15,9 +15,3 @@
5 # You should have received a copy of the GNU General Public License along with
6 # this program; if not, write to the Free Software Foundation, Inc.,
7 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
8-
9-from installbackend import get_install_backend
10-
11-# mvo: this is only there to make pyflakes silent (otherwise it thinks
12-# its a unused import)
13-get_install_backend
14
15=== modified file 'softwarecenter/backend/channel_impl/aptchannels.py'
16--- softwarecenter/backend/channel_impl/aptchannels.py 2012-03-19 13:35:47 +0000
17+++ softwarecenter/backend/channel_impl/aptchannels.py 2012-09-19 08:27:20 +0000
18@@ -27,7 +27,7 @@
19
20 from aptsources.sourceslist import SourceEntry, SourcesList
21
22-from softwarecenter.backend import get_install_backend
23+from softwarecenter.backend.installbackend import get_install_backend
24 from softwarecenter.backend.channel import (ChannelsManager,
25 SoftwareChannel)
26 from softwarecenter.distro import get_distro
27
28=== modified file 'softwarecenter/backend/piston/scaclient.py'
29--- softwarecenter/backend/piston/scaclient.py 2012-03-16 20:12:57 +0000
30+++ softwarecenter/backend/piston/scaclient.py 2012-09-19 08:27:20 +0000
31@@ -30,7 +30,7 @@
32 # patch default_service_root to the one we use
33 from softwarecenter.enums import BUY_SOMETHING_HOST
34 try:
35- from scaclient_pristine import SoftwareCenterAgentAPI
36+ from .scaclient_pristine import SoftwareCenterAgentAPI
37 SoftwareCenterAgentAPI.default_service_root = \
38 BUY_SOMETHING_HOST + "/api/2.0"
39 except:
40
41=== modified file 'softwarecenter/db/application.py'
42--- softwarecenter/db/application.py 2012-09-18 08:34:40 +0000
43+++ softwarecenter/db/application.py 2012-09-19 08:27:20 +0000
44@@ -187,7 +187,7 @@
45 # import here (intead of global) to avoid dbus dependency
46 # in update-software-center (that imports application, but
47 # never uses AppDetails) LP: #620011
48- from softwarecenter.backend import get_install_backend
49+ from softwarecenter.backend.installbackend import get_install_backend
50 self._backend = get_install_backend()
51 # FIXME: why two error states ?
52 self._error = None
53
54=== modified file 'softwarecenter/ui/gtk3/app.py'
55--- softwarecenter/ui/gtk3/app.py 2012-09-14 13:44:38 +0000
56+++ softwarecenter/ui/gtk3/app.py 2012-09-19 08:27:20 +0000
57@@ -120,7 +120,7 @@
58 RecommendationsOptInDialog)
59
60 from softwarecenter.config import get_config
61-from softwarecenter.backend import get_install_backend
62+from softwarecenter.backend.installbackend import get_install_backend
63 from softwarecenter.backend.login import get_login_backend
64 from softwarecenter.backend.recagent import RecommenderAgent
65
66
67=== modified file 'softwarecenter/ui/gtk3/aptd_gtk3.py'
68--- softwarecenter/ui/gtk3/aptd_gtk3.py 2012-03-15 09:32:18 +0000
69+++ softwarecenter/ui/gtk3/aptd_gtk3.py 2012-09-19 08:27:20 +0000
70@@ -60,7 +60,7 @@
71 return res
72
73 if __name__ == "__main__":
74- from softwarecenter.backend import get_install_backend
75+ from softwarecenter.backend.installbackend import get_install_backend
76 from softwarecenter.ui.gtk3.aptd_gtk3 import InstallBackendUI
77 from mock import Mock
78
79
80=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
81--- softwarecenter/ui/gtk3/models/appstore2.py 2012-09-11 04:16:01 +0000
82+++ softwarecenter/ui/gtk3/models/appstore2.py 2012-09-19 08:27:20 +0000
83@@ -36,7 +36,7 @@
84 utf8,
85 unescape,
86 )
87-from softwarecenter.backend import get_install_backend
88+from softwarecenter.backend.installbackend import get_install_backend
89 from softwarecenter.backend.reviews import get_review_loader
90 from softwarecenter.paths import SOFTWARE_CENTER_ICON_CACHE_DIR
91
92
93=== modified file 'softwarecenter/ui/gtk3/models/pendingstore.py'
94--- softwarecenter/ui/gtk3/models/pendingstore.py 2012-05-15 08:36:33 +0000
95+++ softwarecenter/ui/gtk3/models/pendingstore.py 2012-09-19 08:27:20 +0000
96@@ -7,7 +7,7 @@
97 import logging
98
99 from softwarecenter.utils import get_icon_from_theme, utf8
100-from softwarecenter.backend import get_install_backend
101+from softwarecenter.backend.installbackend import get_install_backend
102 from softwarecenter.backend.transactionswatcher import get_transactions_watcher
103
104 from gettext import gettext as _
105
106=== modified file 'softwarecenter/ui/gtk3/panes/softwarepane.py'
107--- softwarecenter/ui/gtk3/panes/softwarepane.py 2012-08-31 03:43:19 +0000
108+++ softwarecenter/ui/gtk3/panes/softwarepane.py 2012-09-19 08:27:20 +0000
109@@ -24,7 +24,7 @@
110 import logging
111 import xapian
112
113-from softwarecenter.backend import get_install_backend
114+from softwarecenter.backend.installbackend import get_install_backend
115 from softwarecenter.db.enquire import AppEnquire
116 from softwarecenter.enums import (
117 DEFAULT_SEARCH_LIMIT,
118
119=== modified file 'softwarecenter/ui/gtk3/panes/viewswitcher.py'
120--- softwarecenter/ui/gtk3/panes/viewswitcher.py 2012-05-30 18:39:55 +0000
121+++ softwarecenter/ui/gtk3/panes/viewswitcher.py 2012-09-19 08:27:20 +0000
122@@ -22,7 +22,7 @@
123
124 from gettext import gettext as _
125
126-from softwarecenter.backend import get_install_backend
127+from softwarecenter.backend.installbackend import get_install_backend
128 from softwarecenter.enums import ViewPages
129 from softwarecenter.backend.channel import (get_channels_manager,
130 AllInstalledChannel,
131
132=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
133--- softwarecenter/ui/gtk3/views/appdetailsview.py 2012-09-05 20:36:07 +0000
134+++ softwarecenter/ui/gtk3/views/appdetailsview.py 2012-09-19 08:27:20 +0000
135@@ -77,7 +77,7 @@
136 from softwarecenter.region import REGION_WARNING_STRING
137
138 from softwarecenter.backend.reviews import get_review_loader
139-from softwarecenter.backend import get_install_backend
140+from softwarecenter.backend.installbackend import get_install_backend
141
142
143 LOG = logging.getLogger(__name__)
144
145=== modified file 'softwarecenter/ui/gtk3/views/purchaseview.py'
146--- softwarecenter/ui/gtk3/views/purchaseview.py 2012-09-06 10:39:42 +0000
147+++ softwarecenter/ui/gtk3/views/purchaseview.py 2012-09-19 08:27:20 +0000
148@@ -29,7 +29,7 @@
149
150 from gettext import gettext as _
151
152-from softwarecenter.backend import get_install_backend
153+from softwarecenter.backend.installbackend import get_install_backend
154 from softwarecenter.ui.gtk3.dialogs import show_accept_tos_dialog
155 from softwarecenter.config import get_config
156 from softwarecenter.ui.gtk3.utils import get_parent
157
158=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
159--- softwarecenter/ui/gtk3/widgets/apptreeview.py 2012-08-15 10:06:32 +0000
160+++ softwarecenter/ui/gtk3/widgets/apptreeview.py 2012-09-19 08:27:20 +0000
161@@ -12,7 +12,7 @@
162
163 from softwarecenter.ui.gtk3.em import em, StockEms
164 from softwarecenter.enums import (AppActions, Icons)
165-from softwarecenter.backend import get_install_backend
166+from softwarecenter.backend.installbackend import get_install_backend
167 from softwarecenter.netstatus import (get_network_watcher,
168 network_state_is_connected)
169 from softwarecenter.ui.gtk3.models.appstore2 import (
170
171=== modified file 'softwarecenter/ui/gtk3/widgets/buttons.py'
172--- softwarecenter/ui/gtk3/widgets/buttons.py 2012-09-12 14:08:18 +0000
173+++ softwarecenter/ui/gtk3/widgets/buttons.py 2012-09-19 08:27:20 +0000
174@@ -21,7 +21,7 @@
175 from gi.repository import Gtk, Gdk, Pango, GObject, GdkPixbuf
176 from gettext import gettext as _
177
178-from softwarecenter.backend import get_install_backend
179+from softwarecenter.backend.installbackend import get_install_backend
180 from softwarecenter.enums import Icons
181 from softwarecenter.ui.gtk3.em import StockEms, em
182 from softwarecenter.ui.gtk3.drawing import darken
183
184=== modified file 'softwarecenter/ui/gtk3/widgets/recommendations.py'
185--- softwarecenter/ui/gtk3/widgets/recommendations.py 2012-09-14 13:25:45 +0000
186+++ softwarecenter/ui/gtk3/widgets/recommendations.py 2012-09-19 08:27:20 +0000
187@@ -28,7 +28,7 @@
188 from softwarecenter.ui.gtk3.utils import get_parent_xid
189 from softwarecenter.db.categories import (RecommendedForYouCategory,
190 AppRecommendationsCategory)
191-from softwarecenter.backend import get_install_backend
192+from softwarecenter.backend.installbackend import get_install_backend
193 from softwarecenter.backend.recagent import RecommenderAgent
194 from softwarecenter.backend.login import get_login_backend
195 from softwarecenter.backend.ubuntusso import get_ubuntu_sso_backend
196
197=== modified file 'softwarecenter/ui/qml/pkglist.py'
198--- softwarecenter/ui/qml/pkglist.py 2012-03-30 09:46:20 +0000
199+++ softwarecenter/ui/qml/pkglist.py 2012-09-19 08:27:20 +0000
200@@ -26,7 +26,7 @@
201 from softwarecenter.db.pkginfo import get_pkg_info
202 from softwarecenter.db.categories import CategoriesParser
203 from softwarecenter.paths import XAPIAN_BASE_PATH
204-from softwarecenter.backend import get_install_backend
205+from softwarecenter.backend.installbackend import get_install_backend
206 from softwarecenter.backend.reviews import get_review_loader
207
208
209
210=== modified file 'tests/test_purchase_backend.py'
211--- tests/test_purchase_backend.py 2012-05-30 18:39:55 +0000
212+++ tests/test_purchase_backend.py 2012-09-19 08:27:20 +0000
213@@ -10,7 +10,7 @@
214 )
215 setup_test_env()
216 from softwarecenter.db.application import Application
217-from softwarecenter.backend import get_install_backend
218+from softwarecenter.backend.installbackend import get_install_backend
219
220
221 class TestPurchaseBackend(unittest.TestCase):
222
223=== modified file 'tests/test_testutils.py'
224--- tests/test_testutils.py 2012-09-12 07:27:54 +0000
225+++ tests/test_testutils.py 2012-09-19 08:27:20 +0000
226@@ -40,7 +40,7 @@
227 self.assertEqual(len(names), 6)
228
229 def test_fake_aptd(self):
230- from softwarecenter.backend import get_install_backend
231+ from softwarecenter.backend.installbackend import get_install_backend
232 backend = get_install_backend()
233 backend.install(Application("2vcard", ""), iconname="")
234 do_events_with_sleep()
235
236=== modified file 'utils/update-software-center-channels'
237--- utils/update-software-center-channels 2012-04-13 12:05:35 +0000
238+++ utils/update-software-center-channels 2012-09-19 08:27:20 +0000
239@@ -10,7 +10,7 @@
240 from gi.repository import GObject
241
242 from softwarecenter.db.database import StoreDatabase
243-from softwarecenter.backend import get_install_backend
244+from softwarecenter.backend.installbackend import get_install_backend
245 import softwarecenter.paths
246
247 LOG = logging.getLogger("update-software-center-channels")

Subscribers

People subscribed via source and target branches