Merge lp:~laney/software-center/misc-small-fixes into lp:software-center

[Iain Lane]

- Don't use super() when not using a "new-style" class (not derived from object)
- Don't free IconViews
- Update a test which uses live archive data to be consistent with reality
- test_xapian: Make the directory to hold the index if we need to

Some small easy-ish fixes which I noticed while trying to make the tests pass again.

The super() thing I learned from http://stackoverflow.com/questions/489269/python-super-raises-typeerror-why

[Michael Vogt (mvo)]

Thanks, this looks good. Please also add a commit message.

review: Approve

[Iain Lane (laney)]

Hope multiline commit messages are ok.

btw, I pinged dobey about the remaining failed tests and he advised me to disable any that aren't trivially fixable since nobody is really working on s-c ATM. Do you think that's sensible?

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    software-store-developers

Unaccepted Authors:

    Iain Lane <email address hidden>

=== modified file 'softwarecenter/config.py'
--- softwarecenter/config.py	2013-07-05 20:18:26 +0000
+++ softwarecenter/config.py	2013-07-09 14:40:38 +0000
@@ -35,7 +35,7 @@
     SECTIONS = ("general", "reviews")
 
     def __init__(self, config):
-        super(SoftwareCenterConfig, self).__init__()
+        SafeConfigParser.__init__(self)
         # imported here to avoid cycle
         from utils import safe_makedirs
         safe_makedirs(os.path.dirname(config))

=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2012-12-06 16:16:49 +0000
+++ softwarecenter/utils.py	2013-07-09 14:40:38 +0000
@@ -487,7 +487,6 @@
         icon_info = icons.lookup_icon(Icons.MISSING_APP, iconsize, 0)
     if icon_info is not None:
         icon_file_path = icon_info.get_filename()
-        icon_info.free()
         return icon_file_path
 
 

=== modified file 'tests/test_addons.py'
--- tests/test_addons.py	2012-12-13 15:34:16 +0000
+++ tests/test_addons.py	2013-07-09 14:40:38 +0000
@@ -38,7 +38,7 @@
     def test_enhances(self):
         """Ensure that 'Enhances:' are picked up correctly """
         res = self.cache.get_addons("powerwake")
-        self.assertEqual(res, ([], ["powernap"]))
+        self.assertEqual(res, ([], ["powernap", "powerwaked"]))
 
     def test_enhances_with_virtual_pkgs(self):
         res = self.cache.get_addons("bibletime")

=== modified file 'tests/test_xapian.py'
--- tests/test_xapian.py	2012-08-23 15:01:40 +0000
+++ tests/test_xapian.py	2013-07-09 14:40:38 +0000
@@ -23,6 +23,8 @@
         # but for now that does not matter that much, only if we
         # call open the db is actually read and the path checked
         pathname = os.path.join(REAL_DATA_DIR, "xapian")
+        if not os.path.exists(pathname):
+            os.makedirs(pathname)
         if not os.listdir(pathname):
             rebuild_database(pathname)
         self.xapiandb = xapian.Database(pathname)