Merge lp:~dobey/software-center/kill-distroseries into lp:software-center

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 3320
Merged at revision: 3320
Proposed branch: lp:~dobey/software-center/kill-distroseries
Merge into: lp:software-center
Diff against target: 106 lines (+0/-41)
6 files modified
setup.py (+0/-7)
softwarecenter/distro/__init__.py (+0/-5)
softwarecenter/distro/fedora.py (+0/-9)
softwarecenter/distro/suselinux.py (+0/-3)
softwarecenter/distro/ubuntu.py (+0/-10)
utils/piston-helpers/piston_get_reviews_helper.py (+0/-7)
To merge this branch: bzr merge lp:~dobey/software-center/kill-distroseries
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+196630@code.launchpad.net

Commit message

Remove usage of DISTROSERIES list, as it is unsustainable.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2013-09-11 18:04:00 +0000
3+++ setup.py 2013-11-25 22:18:53 +0000
4@@ -47,13 +47,6 @@
5 DISTRO = '%s'
6 RELEASE = '%s'
7 """ % (VERSION, codename, distro, release))
8- # double check that we have the latest distro series and fail if not
9- if distro == "Ubuntu":
10- import softwarecenter.distro.ubuntu
11- if not codename in softwarecenter.distro.ubuntu.Ubuntu.DISTROSERIES:
12- raise ValueError("Could not find '%s' in ubuntu distro class "
13- "please add it to DISTROSERIES", codename)
14-
15
16 # update po4a
17 if sys.argv[1] == "build":
18
19=== modified file 'softwarecenter/distro/__init__.py'
20--- softwarecenter/distro/__init__.py 2013-08-21 14:23:53 +0000
21+++ softwarecenter/distro/__init__.py 2013-11-25 22:18:53 +0000
22@@ -31,11 +31,6 @@
23 class Distro(object):
24 """ abstract base class for a distribution """
25
26- # list of code names for the distro from newest to oldest, this is
27- # used e.g. in the reviews loader if no reviews for the current codename
28- # are found
29- DISTROSERIES = []
30-
31 # base path for the review summary, the JS will append %i.png
32 # (with i={1,5})
33 REVIEW_SUMMARY_STARS_BASE_PATH = \
34
35=== modified file 'softwarecenter/distro/fedora.py'
36--- softwarecenter/distro/fedora.py 2013-08-21 14:23:53 +0000
37+++ softwarecenter/distro/fedora.py 2013-11-25 22:18:53 +0000
38@@ -24,15 +24,6 @@
39
40
41 class Fedora(Distro):
42- DISTROSERIES = [
43- 'Beefy Miracle',
44- 'Verne',
45- 'Lovelock',
46- 'Laughlin',
47- 'Leonidas',
48- 'Constantine',
49- ]
50-
51 # disable paid software
52 PURCHASE_APP_URL = None
53
54
55=== modified file 'softwarecenter/distro/suselinux.py'
56--- softwarecenter/distro/suselinux.py 2012-11-28 16:58:59 +0000
57+++ softwarecenter/distro/suselinux.py 2013-11-25 22:18:53 +0000
58@@ -22,9 +22,6 @@
59
60
61 class Suselinux(Distro):
62- # see __init__.py description
63- DISTROSERIES = ["11.4",
64- ]
65
66 # screenshot handling
67 SCREENSHOT_THUMB_URL = ("http://screenshots.ubuntu.com/"
68
69=== modified file 'softwarecenter/distro/ubuntu.py'
70--- softwarecenter/distro/ubuntu.py 2013-08-21 14:23:53 +0000
71+++ softwarecenter/distro/ubuntu.py 2013-11-25 22:18:53 +0000
72@@ -33,16 +33,6 @@
73
74 class Ubuntu(Debian):
75
76- # see __init__.py description
77- DISTROSERIES = [
78- "saucy",
79- "raring",
80- "quantal",
81- "precise",
82- "oneiric",
83- "natty",
84- ]
85-
86 # metapackages
87 IMPORTANT_METAPACKAGES = (
88 "ubuntu-standard",
89
90=== modified file 'utils/piston-helpers/piston_get_reviews_helper.py'
91--- utils/piston-helpers/piston_get_reviews_helper.py 2011-10-13 13:39:21 +0000
92+++ utils/piston-helpers/piston_get_reviews_helper.py 2013-11-25 22:18:53 +0000
93@@ -22,13 +22,6 @@
94 """
95 piston_reviews = rnrclient.get_reviews(**kwargs)
96
97- # test if we don't have reviews for the current distroseries
98- # and fallback to the previous oneif that is the case
99- if (piston_reviews == [] and
100- kwargs["distroseries"] == distro.DISTROSERIES[0]):
101- kwargs["distroseries"] = distro.DISTROSERIES[1]
102- piston_reviews = rnrclient.get_reviews(**kwargs)
103-
104 # the backend sometimes returns None so we fix this here
105 if piston_reviews is None:
106 piston_reviews = []

Subscribers

People subscribed via source and target branches