[kernel] r18491 - dists/trunk/linux-2.6/debian/lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Wed Jan 11 17:16:01 UTC 2012
Author: waldi
Date: Wed Jan 11 17:16:00 2012
New Revision: 18491
Log:
debian/lib/python: Remove SortedDict, use collections.OrderedDict instead.
Modified:
dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/kconfig.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py Wed Jan 11 17:05:44 2012 (r18490)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py Wed Jan 11 17:16:00 2012 (r18491)
@@ -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 Package(dict):
- _fields = utils.SortedDict((
+ _fields = OrderedDict((
('Package', str),
('Source', str),
('Architecture', PackageFieldList),
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Wed Jan 11 17:05:44 2012 (r18490)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Wed Jan 11 17:16:00 2012 (r18491)
@@ -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
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/kconfig.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/kconfig.py Wed Jan 11 17:05:44 2012 (r18490)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/kconfig.py Wed Jan 11 17:16:00 2012 (r18491)
@@ -1,6 +1,4 @@
-from __future__ import absolute_import
-
-from .utils import SortedDict
+from collections import OrderedDict
__all__ = (
"KconfigFile",
@@ -44,7 +42,7 @@
return "%s=m" % conf
-class KconfigFile(SortedDict):
+class KconfigFile(OrderedDict):
def __str__(self):
ret = []
for i in self.str_iter():
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py Wed Jan 11 17:05:44 2012 (r18490)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py Wed Jan 11 17:16:00 2012 (r18491)
@@ -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"]):
More information about the Kernel-svn-changes
mailing list