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

[Michael Vogt]

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

[Natalia Bidart (nataliabidart)]

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

review: Approve

=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2012-05-24 08:55:44 +0000
+++ softwarecenter/utils.py	2012-06-12 15:41:24 +0000
@@ -331,7 +331,7 @@
     takes a PPA SourceEntry and returns a filename suitable for sources.list.d
     """
     import apt_pkg
-    name = "%s.list" % apt_pkg.URItoFileName(entry.uri)
+    name = "%s.list" % apt_pkg.uri_to_filename(entry.uri)
     return name
 
 
 
=== modified file 'tests/test_apthistory.py'
--- tests/test_apthistory.py	2012-05-30 21:52:08 +0000
+++ tests/test_apthistory.py	2012-06-12 15:41:24 +0000
@@ -21,8 +21,8 @@
 
     def setUp(self):
         self.basedir = os.path.join(DATA_DIR, "apt-history")
-        apt.apt_pkg.Config.set("Dir::Log", self.basedir)
-        #apt_pkg.Config.set("Dir::Log::History", "./")
+        apt.apt_pkg.config.set("Dir::Log", self.basedir)
+        #apt_pkg.config.set("Dir::Log::History", "./")
 
     def _get_apt_history(self):
         history = AptHistory(use_cache=False)
@@ -84,11 +84,11 @@
 
     def test_no_history_log(self):
         # set to dir with no existing history.log
-        apt.apt_pkg.Config.set("Dir::Log", "/")
+        apt.apt_pkg.config.set("Dir::Log", "/")
         # this should not raise
         history = self._get_apt_history()
         self.assertEqual(history.transactions, [])
-        apt.apt_pkg.Config.set("Dir::Log", self.basedir)
+        apt.apt_pkg.config.set("Dir::Log", self.basedir)
 
 if __name__ == "__main__":
     unittest.main()