debian/lib/python: Remove SortedDict, use collections.OrderedDict instead.

svn path=/dists/trunk/linux-2.6/; revision=18491

4 files changed, 9 insertions, 45 deletions

diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py
index e2e1c66d10c1..68e18064800a 100644
--- a/debian/lib/python/debian_linux/debian.py
+++ b/debian/lib/python/debian_linux/debian.py
@@ -1,8 +1,9 @@
+from collections import OrderedDict
 import itertools
 import os.path
 import re
-import utils
 
+from . import utils
 
 class Changelog(list):
     _rules = r"""
@@ -362,7 +363,7 @@ class PackageRelationEntry(object):
 
 
 class Package(dict):
-    _fields = utils.SortedDict((
+    _fields = OrderedDict((
         ('Package', str),
         ('Source', str),
         ('Architecture', PackageFieldList),
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index f49c5b1f7a8d..4317026542d2 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -1,8 +1,9 @@
-from debian import *
-from utils import SortedDict
+from collections import OrderedDict
 
+from .debian import *
 
-class PackagesList(SortedDict):
+
+class PackagesList(OrderedDict):
     def append(self, package):
         self[package['Package']] = package
 
diff --git a/debian/lib/python/debian_linux/kconfig.py b/debian/lib/python/debian_linux/kconfig.py
index 70668c8e3eff..23e459ac66cf 100644
--- a/debian/lib/python/debian_linux/kconfig.py
+++ b/debian/lib/python/debian_linux/kconfig.py
@@ -1,6 +1,4 @@
-from __future__ import absolute_import
-
-from .utils import SortedDict
+from collections import OrderedDict
 
 __all__ = (
     "KconfigFile",
@@ -44,7 +42,7 @@ class EntryTristate(object):
             return "%s=m" % conf
 
 
-class KconfigFile(SortedDict):
+class KconfigFile(OrderedDict):
     def __str__(self):
         ret = []
         for i in self.str_iter():
diff --git a/debian/lib/python/debian_linux/utils.py b/debian/lib/python/debian_linux/utils.py
index ef62fc4af0df..d38c7b5eb873 100644
--- a/debian/lib/python/debian_linux/utils.py
+++ b/debian/lib/python/debian_linux/utils.py
@@ -1,43 +1,7 @@
-from __future__ import absolute_import
-
 import os
 import re
 import textwrap
 
-_marker = object
-
-
-class SortedDict(dict):
-    __slots__ = '_list',
-
-    def __init__(self, entries=None):
-        super(SortedDict, self).__init__()
-        self._list = []
-        if entries is not None:
-            for key, value in entries:
-                self[key] = value
-
-    def __delitem__(self, key):
-        super(SortedDict, self).__delitem__(key)
-        self._list.remove(key)
-
-    def __setitem__(self, key, value):
-        super(SortedDict, self).__setitem__(key, value)
-        if key not in self._list:
-            self._list.append(key)
-
-    def iterkeys(self):
-        for i in iter(self._list):
-            yield i
-
-    def iteritems(self):
-        for i in iter(self._list):
-            yield (i, self[i])
-
-    def itervalues(self):
-        for i in iter(self._list):
-            yield self[i]
-
 
 class Templates(object):
     def __init__(self, dirs=["debian/templates"]):