Ubuntu Software Center

Merge lp:~mvo/software-center/python-apt-0.8 into lp:software-center

  1. python-apt-0.8
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Merged at revision: 3041
Proposed branch: lp:~mvo/software-center/python-apt-0.8
Merge into: lp:software-center
Diff against target: 41 lines (+5/-5)
2 files modified
softwarecenter/utils.py (+1/-1)
tests/test_apthistory.py (+4/-4)
To merge this branch: bzr merge lp:~mvo/software-center/python-apt-0.8
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Review via email: mp+109875@code.launchpad.net

Description of the change

Trivial fixes for a leftover python-apt 0.7 -> 0.8 API transition.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks great! and the test suite is all green on Precise.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/utils.py'
2--- softwarecenter/utils.py 2012-05-24 08:55:44 +0000
3+++ softwarecenter/utils.py 2012-06-12 15:41:24 +0000
4@@ -331,7 +331,7 @@
5 takes a PPA SourceEntry and returns a filename suitable for sources.list.d
6 """
7 import apt_pkg
8- name = "%s.list" % apt_pkg.URItoFileName(entry.uri)
9+ name = "%s.list" % apt_pkg.uri_to_filename(entry.uri)
10 return name
11
12
13
14=== modified file 'tests/test_apthistory.py'
15--- tests/test_apthistory.py 2012-05-30 21:52:08 +0000
16+++ tests/test_apthistory.py 2012-06-12 15:41:24 +0000
17@@ -21,8 +21,8 @@
18
19 def setUp(self):
20 self.basedir = os.path.join(DATA_DIR, "apt-history")
21- apt.apt_pkg.Config.set("Dir::Log", self.basedir)
22- #apt_pkg.Config.set("Dir::Log::History", "./")
23+ apt.apt_pkg.config.set("Dir::Log", self.basedir)
24+ #apt_pkg.config.set("Dir::Log::History", "./")
25
26 def _get_apt_history(self):
27 history = AptHistory(use_cache=False)
28@@ -84,11 +84,11 @@
29
30 def test_no_history_log(self):
31 # set to dir with no existing history.log
32- apt.apt_pkg.Config.set("Dir::Log", "/")
33+ apt.apt_pkg.config.set("Dir::Log", "/")
34 # this should not raise
35 history = self._get_apt_history()
36 self.assertEqual(history.transactions, [])
37- apt.apt_pkg.Config.set("Dir::Log", self.basedir)
38+ apt.apt_pkg.config.set("Dir::Log", self.basedir)
39
40 if __name__ == "__main__":
41 unittest.main()

Subscribers

People subscribed via source and target branches