Merge lp:~dobey/software-center/fix-1038429 into lp:software-center

Proposed by dobey on 2013-07-05
Status: Merged
Approved by: dobey on 2013-07-05
Approved revision: 3308
Merged at revision: 3308
Proposed branch: lp:~dobey/software-center/fix-1038429
Merge into: lp:software-center
Diff against target: 19 lines (+2/-3)
1 file modified
softwarecenter/config.py (+2/-3)
To merge this branch: bzr merge lp:~dobey/software-center/fix-1038429
Reviewer Review Type Date Requested Status
Mike McCracken (community) 2013-07-05 Approve on 2013-07-05
Review via email: mp+173276@code.launchpad.net

Commit message

Don't derive from both object and something else, as it's needless.
Use super().__init__() instead of direct parent.__init__() calls.

To post a comment you must log in.
Mike McCracken (mikemc) wrote :

This fixed the problem for me too:

I saw the backtrace when trying 'python setup.py build' on a branch of trunk on raring, with python-configparser installed. merging this branch fixed it.

review: Approve
Barry Warsaw (barry) wrote :

FWIW, I probably would have switched the conditional imports to try the Python 2 version first. But whatevs!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/config.py'
2--- softwarecenter/config.py 2012-12-06 16:16:49 +0000
3+++ softwarecenter/config.py 2013-07-05 20:39:24 +0000
4@@ -30,13 +30,12 @@
5 LOG = logging.getLogger(__name__)
6
7
8-class SoftwareCenterConfig(object, SafeConfigParser):
9+class SoftwareCenterConfig(SafeConfigParser):
10
11 SECTIONS = ("general", "reviews")
12
13 def __init__(self, config):
14- object.__init__(self)
15- SafeConfigParser.__init__(self)
16+ super(SoftwareCenterConfig, self).__init__()
17 # imported here to avoid cycle
18 from utils import safe_makedirs
19 safe_makedirs(os.path.dirname(config))

Subscribers

People subscribed via source and target branches