aptsources: Make all classes subclasses of object.

4 files changed, 10 insertions, 8 deletions

diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py
index 0614bd1c..0aa34f20 100644
--- a/aptsources/distinfo.py
+++ b/aptsources/distinfo.py
@@ -36,7 +36,7 @@ def _(s):
     return gettext.dgettext("python-apt", s)
 
 
-class Template:
+class Template(object):
 
     def __init__(self):
         self.name = None
@@ -66,7 +66,7 @@ class Template:
             return False
 
 
-class Component:
+class Component(object):
 
     def __init__(self, name, desc=None, long_desc=None):
         self.name = name
@@ -91,7 +91,7 @@ class Component:
         return self.description_long
 
 
-class Mirror:
+class Mirror(object):
     ''' Storage for mirror related information '''
 
     def __init__(self, proto, hostname, dir, location=None):
@@ -124,7 +124,7 @@ class Mirror:
         self.location = location
 
 
-class Repository:
+class Repository(object):
 
     def __init__(self, proto, dir):
         self.proto = proto
@@ -145,7 +145,7 @@ def split_url(url):
     return split
 
 
-class DistInfo:
+class DistInfo(object):
 
     def __init__(self,
                  dist = None,
diff --git a/aptsources/distro.py b/aptsources/distro.py
index 2cbad9fb..5a6301bd 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -38,7 +38,7 @@ class NoDistroTemplateException(Exception):
     pass
 
 
-class Distribution:
+class Distribution(object):
 
     def __init__(self, id, codename, description, release):
         """ Container for distribution specific informations """
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py
index 710bfe15..76bea43a 100644
--- a/aptsources/sourceslist.py
+++ b/aptsources/sourceslist.py
@@ -74,7 +74,7 @@ def uniq(s):
     return list(set(s))
 
 
-class SourceEntry:
+class SourceEntry(object):
     """ single sources.list entry """
 
     def __init__(self, line, file=None):
@@ -394,7 +394,7 @@ class SourcesList(object):
         return (parents, used_child_templates)
 
 
-class SourceEntryMatcher:
+class SourceEntryMatcher(object):
     """ matcher class to make a source entry look nice
         lots of predefined matchers to make it i18n/gettext friendly
         """
diff --git a/debian/changelog b/debian/changelog
index ba6dbd40..b955b155 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ python-apt (0.7.93) UNRELEASED; urgency=low
   * Make all class-level constants have uppercase names.
   * Rewrite apt.progress.gtk2 documentation by hand and drop python-gtk2
     build-time dependency.
+  * aptsources:
+    - Make all classes subclasses of object.
 
   [ Colin Watson ]
   * apt/progress/__init__.py: