[kernel] r8981 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Sun Jun 17 10:34:22 UTC 2007
Author: waldi
Date: Sun Jun 17 10:34:22 2007
New Revision: 8981
Log:
debian/bin/gencontrol.py, debian/lib/python/debian_linux: Coding style cleanup.
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/__init__.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
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/utils.py
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Sun Jun 17 10:34:22 2007
@@ -1,16 +1,17 @@
#!/usr/bin/env python2.4
import os, sys
sys.path.append("debian/lib/python")
-import debian_linux.gencontrol
+
+from debian_linux.gencontrol import Gencontrol as Base
from debian_linux.debian import *
-class gencontrol(debian_linux.gencontrol.gencontrol):
+class Gencontrol(Base):
def __init__(self):
- super(gencontrol, self).__init__()
+ super(Gencontrol, self).__init__()
self.process_changelog()
def do_main_setup(self, vars, makeflags, extra):
- super(gencontrol, self).do_main_setup(vars, makeflags, extra)
+ super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
vars.update(self.config['image',])
makeflags.update({
'SOURCEVERSION': self.version.complete,
@@ -28,7 +29,7 @@
headers_arch = self.templates["control.headers.arch"]
packages_headers_arch = self.process_packages(headers_arch, vars)
- extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = package_relation_list()
+ extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = PackageRelationList()
for package in packages_headers_arch:
name = package['Package']
@@ -103,30 +104,30 @@
config_entry_relations = self.config.merge('relations', arch, subarch, flavour)
compiler = config_entry_base.get('compiler', 'gcc')
- relations_compiler = package_relation_list(config_entry_relations[compiler])
- relations_compiler_build_dep = package_relation_list(config_entry_relations[compiler])
+ relations_compiler = PackageRelationList(config_entry_relations[compiler])
+ relations_compiler_build_dep = PackageRelationList(config_entry_relations[compiler])
for group in relations_compiler_build_dep:
for item in group:
item.arches = [arch]
packages['source']['Build-Depends'].extend(relations_compiler_build_dep)
image_relations = {
- 'conflicts': package_relation_list(),
- 'depends': package_relation_list(),
+ 'conflicts': PackageRelationList(),
+ 'depends': PackageRelationList(),
}
if vars.get('initramfs', True):
generators = vars['initramfs-generators']
config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, subarch, flavour)
commands = [config_entry_commands_initramfs[i] for i in generators if config_entry_commands_initramfs.has_key(i)]
makeflags['INITRD_CMD'] = ' '.join(commands)
- l_depends = package_relation_group()
+ l_depends = PackageRelationGroup()
for i in generators:
i = config_entry_relations.get(i, i)
l_depends.append(i)
- a = package_relation(i)
+ a = PackageRelation(i)
if a.operator is not None:
a.operator = -a.operator
- image_relations['conflicts'].append(package_relation_group([a]))
+ image_relations['conflicts'].append(PackageRelationGroup([a]))
image_relations['depends'].append(l_depends)
packages_dummy = []
@@ -246,7 +247,7 @@
def process_real_image(self, in_entry, relations, config, vars):
entry = self.process_package(in_entry, vars)
for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts':
- value = entry.get(field, package_relation_list())
+ value = entry.get(field, PackageRelationList())
t = vars.get(field.lower(), [])
value.extend(t)
t = relations.get(field.lower(), [])
@@ -260,7 +261,7 @@
entry = self.process_package(in_entry, vars)
versions = [i.version for i in self.changelog[::-1]]
for i in (('Depends', 'Provides')):
- value = package_relation_list()
+ value = PackageRelationList()
value.extend(entry.get(i, []))
if i == 'Depends':
value.append("linux-patch-debian-%(linux_version)s (= %(complete)s)" % self.changelog[0].version.__dict__)
@@ -271,4 +272,4 @@
return entry
if __name__ == '__main__':
- gencontrol()()
+ Gencontrol()()
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/__init__.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/__init__.py (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/__init__.py Sun Jun 17 10:34:22 2007
@@ -1,6 +0,0 @@
-import os, os.path, re, sys, textwrap, ConfigParser
-
-from config import config_reader
-from debian import *
-from utils import *
-
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py Sun Jun 17 10:34:22 2007
@@ -1,14 +1,14 @@
-import os, os.path, re, sys, textwrap, ConfigParser
+import os, os.path, re, sys, textwrap
__all__ = [
- 'config_parser',
- 'config_reader',
- 'config_reader_arch',
+ 'ConfigParser',
+ 'ConfigReader',
+ 'ConfigReaderCore',
]
_marker = object()
-class schema_item_boolean(object):
+class SchemaItemBoolean(object):
def __call__(self, i):
i = i.strip().lower()
if i in ("true", "1"):
@@ -17,7 +17,7 @@
return False
raise Error
-class schema_item_list(object):
+class SchemaItemList(object):
def __init__(self, type = "\s+"):
self.type = type
@@ -27,7 +27,7 @@
return []
return [j.strip() for j in re.split(self.type, i)]
-class config_reader(dict):
+class ConfigReader(dict):
config_name = "defines"
def __init__(self, dirs = []):
@@ -36,18 +36,18 @@
def __getitem__(self, key):
return self.get(key)
- def _get_files(self, name):
- return [os.path.join(i, name) for i in self._dirs if i]
-
def _update(self, ret, inputkey):
- for key, value in super(config_reader, self).get(tuple(inputkey), {}).iteritems():
+ for key, value in super(ConfigReader, self).get(tuple(inputkey), {}).iteritems():
ret[key] = value
+ def getFiles(self, name):
+ return [os.path.join(i, name) for i in self._dirs if i]
+
def get(self, key, default = _marker):
if isinstance(key, basestring):
key = key,
- ret = super(config_reader, self).get(tuple(key), default)
+ ret = super(ConfigReader, self).get(tuple(key), default)
if ret == _marker:
raise KeyError, key
return ret
@@ -59,28 +59,28 @@
return ret
def sections(self):
- return super(config_reader, self).keys()
+ return super(ConfigReader, self).keys()
-class config_reader_arch(config_reader):
+class ConfigReaderCore(ConfigReader):
schema = {
- 'arches': schema_item_list(),
- 'available': schema_item_boolean(),
- 'configs': schema_item_list(),
- 'flavours': schema_item_list(),
- 'initramfs': schema_item_boolean(),
- 'initramfs-generators': schema_item_list(),
- 'modules': schema_item_boolean(),
- 'subarches': schema_item_list(),
- 'versions': schema_item_list(),
+ 'arches': SchemaItemList(),
+ 'available': SchemaItemBoolean(),
+ 'configs': SchemaItemList(),
+ 'flavours': SchemaItemList(),
+ 'initramfs': SchemaItemBoolean(),
+ 'initramfs-generators': SchemaItemList(),
+ 'modules': SchemaItemBoolean(),
+ 'subarches': SchemaItemList(),
+ 'versions': SchemaItemList(),
}
def __init__(self, dirs = []):
- super(config_reader_arch, self).__init__(dirs)
- self._read_base()
+ super(ConfigReaderCore, self).__init__(dirs)
+ self._readBase()
- def _read_arch(self, arch):
- files = self._get_files("%s/%s" % (arch, self.config_name))
- config = config_parser(self.schema, files)
+ def _readArch(self, arch):
+ files = self.getFiles("%s/%s" % (arch, self.config_name))
+ config = ConfigParser(self.schema, files)
subarches = config['base',].get('subarches', [])
flavours = config['base',].get('flavours', [])
@@ -109,7 +109,7 @@
else:
avail = True
if avail:
- self._read_subarch(arch, subarch)
+ self._readSubarch(arch, subarch)
base = self['base', arch]
base['subarches'] = subarches
@@ -120,11 +120,11 @@
self['base', arch] = base
self['base', arch, 'none'] = {'flavours': flavours}
for flavour in flavours:
- self._read_flavour(arch, 'none', flavour)
+ self._readFlavour(arch, 'none', flavour)
- def _read_base(self):
- files = self._get_files(self.config_name)
- config = config_parser(self.schema, files)
+ def _readBase(self):
+ files = self.getFiles(self.config_name)
+ config = ConfigParser(self.schema, files)
arches = config['base',]['arches']
@@ -142,18 +142,18 @@
except KeyError:
avail = True
if avail:
- self._read_arch(arch)
+ self._readArch(arch)
- def _read_flavour(self, arch, subarch, flavour):
+ def _readFlavour(self, arch, subarch, flavour):
if not self.has_key(('base', arch, subarch, flavour)):
if subarch == 'none':
import warnings
warnings.warn('No config entry for flavour %s, subarch none, arch %s' % (flavour, arch), DeprecationWarning)
self['base', arch, subarch, flavour] = {}
- def _read_subarch(self, arch, subarch):
+ def _readSubarch(self, arch, subarch):
files = self._get_files("%s/%s/%s" % (arch, subarch, self.config_name))
- config = config_parser(self.schema, files)
+ config = ConfigParser(self.schema, files)
flavours = config['base',].get('flavours', [])
@@ -169,7 +169,7 @@
self[tuple(real)] = s
for flavour in flavours:
- self._read_flavour(arch, subarch, flavour)
+ self._readFlavour(arch, subarch, flavour)
def merge(self, section, arch = None, subarch = None, flavour = None):
ret = {}
@@ -184,13 +184,14 @@
ret.update(self.get((section, arch, subarch, flavour), {}))
return ret
-class config_parser(object):
+class ConfigParser(object):
__slots__ = 'configs', 'schema'
def __init__(self, schema, files):
self.configs = []
self.schema = schema
for file in files:
+ import ConfigParser
config = ConfigParser.ConfigParser()
config.read(file)
self.configs.append(config)
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 (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py Sun Jun 17 10:34:22 2007
@@ -121,7 +121,24 @@
else:
self.linux_upstream = d['version']
-class package_description(object):
+class PackageFieldList(list):
+ def __init__(self, value = None):
+ self.extend(value)
+
+ def __str__(self):
+ return ' '.join(self)
+
+ def _extend(self, value):
+ if value is not None:
+ self.extend([j.strip() for j in re.split('\s', value.strip())])
+
+ def extend(self, value):
+ if isinstance(value, str):
+ self._extend(value)
+ else:
+ super(PackageFieldList, self).extend(value)
+
+class PackageDescription(object):
__slots__ = "short", "long"
def __init__(self, value = None):
@@ -134,7 +151,7 @@
def __str__(self):
ret = self.short + '\n'
- w = utils.wrap(width = 74, fix_sentence_endings = True)
+ w = utils.TextWrapper(width = 74, fix_sentence_endings = True)
pars = []
for i in self.long:
pars.append('\n '.join(w.wrap(i)))
@@ -145,7 +162,7 @@
if str:
self.long.extend(str.split("\n.\n"))
-class package_relation(object):
+class PackageRelation(object):
__slots__ = "name", "operator", "version", "arches"
_re = re.compile(r'^(\S+)(?: \((<<|<=|=|!=|>=|>>)\s*([^)]+)\))?(?: \[([^]]+)\])?$')
@@ -228,7 +245,7 @@
else:
self.arches = []
-class package_relation_list(list):
+class PackageRelationList(list):
def __init__(self, value = None):
if value is not None:
self.extend(value)
@@ -244,14 +261,14 @@
def append(self, value):
if isinstance(value, basestring):
- value = package_relation_group(value)
- elif not isinstance(value, package_relation_group):
+ value = PackageRelationGroup(value)
+ elif not isinstance(value, PackageRelationGroup):
raise ValueError, "got %s" % type(value)
j = self._match(value)
if j:
- j._update_arches(value)
+ j._updateArches(value)
else:
- super(package_relation_list, self).append(value)
+ super(PackageRelationList, self).append(value)
def config(self, entry):
for i in self:
@@ -265,7 +282,7 @@
for i in value:
self.append(i)
-class package_relation_group(list):
+class PackageRelationGroup(list):
def __init__(self, value = None):
if value is not None:
self.extend(value)
@@ -279,7 +296,7 @@
return None
return self
- def _update_arches(self, value):
+ def _updateArches(self, value):
for i, j in itertools.izip(self, value):
if i.arches:
for arch in j.arches:
@@ -288,10 +305,10 @@
def append(self, value):
if isinstance(value, basestring):
- value = package_relation(value)
- elif not isinstance(value, package_relation):
+ value = PackageRelation(value)
+ elif not isinstance(value, PackageRelation):
raise ValueError
- super(package_relation_group, self).append(value)
+ super(PackageRelationGroup, self).append(value)
def config(self, entry):
for i in self:
@@ -305,26 +322,26 @@
for i in value:
self.append(i)
-class package(dict):
- _fields = utils.sorted_dict((
+class Package(dict):
+ _fields = utils.SortedDict((
('Package', str),
('Source', str),
- ('Architecture', utils.field_list),
+ ('Architecture', PackageFieldList),
('Section', str),
('Priority', str),
('Maintainer', str),
('Uploaders', str),
('Standards-Version', str),
- ('Build-Depends', package_relation_list),
- ('Build-Depends-Indep', package_relation_list),
- ('Provides', package_relation_list),
- ('Pre-Depends', package_relation_list),
- ('Depends', package_relation_list),
- ('Recommends', package_relation_list),
- ('Suggests', package_relation_list),
- ('Replaces', package_relation_list),
- ('Conflicts', package_relation_list),
- ('Description', package_description),
+ ('Build-Depends', PackageRelationList),
+ ('Build-Depends-Indep', PackageRelationList),
+ ('Provides', PackageRelationList),
+ ('Pre-Depends', PackageRelationList),
+ ('Depends', PackageRelationList),
+ ('Recommends', PackageRelationList),
+ ('Suggests', PackageRelationList),
+ ('Replaces', PackageRelationList),
+ ('Conflicts', PackageRelationList),
+ ('Description', PackageDescription),
))
def __setitem__(self, key, value):
@@ -333,7 +350,7 @@
if not isinstance(value, cls):
value = cls(value)
except KeyError: pass
- super(package, self).__setitem__(key, value)
+ super(Package, self).__setitem__(key, value)
def iterkeys(self):
keys = set(self.keys())
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 (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Sun Jun 17 10:34:22 2007
@@ -2,7 +2,7 @@
from debian import *
from utils import *
-class packages_list(sorted_dict):
+class PackagesList(SortedDict):
def append(self, package):
self[package['Package']] = package
@@ -10,7 +10,7 @@
for package in packages:
self[package['Package']] = package
-class flags(dict):
+class MakeFlags(dict):
def __repr__(self):
repr = super(flags, self).__repr__()
return "%s(%s)" % (self.__class__.__name__, repr)
@@ -19,17 +19,17 @@
return ' '.join(["%s='%s'" % i for i in self.iteritems()])
def copy(self):
- return self.__class__(super(flags, self).copy())
+ return self.__class__(super(MakeFlags, self).copy())
-class gencontrol(object):
+class Gencontrol(object):
makefile_targets = ('binary-arch', 'build', 'setup', 'source')
def __init__(self, underlay = None):
- self.config = config_reader_arch([underlay, "debian/arch"])
- self.templates = templates()
+ self.config = ConfigReaderCore([underlay, "debian/arch"])
+ self.templates = Templates()
def __call__(self):
- packages = packages_list()
+ packages = PackagesList()
makefile = [('.NOTPARALLEL:', ())]
self.do_source(packages)
@@ -48,7 +48,7 @@
vars = self.vars.copy()
vars.update(config_entry)
- makeflags = flags()
+ makeflags = MakeFlags()
extra = {}
self.do_main_setup(vars, makeflags, extra)
@@ -196,11 +196,11 @@
def process_relation(self, key, e, in_e, vars):
in_dep = in_e[key]
- dep = package_relation_list()
+ dep = PackageRelationList()
for in_groups in in_dep:
- groups = package_relation_group()
+ groups = PackageRelationGroup()
for in_item in in_groups:
- item = package_relation()
+ item = PackageRelation()
item.name = self.substitute(in_item.name, vars)
item.operator = in_item.operator
if in_item.version is not None:
@@ -219,9 +219,9 @@
e['Description'] = desc
def process_package(self, in_entry, vars):
- e = package()
+ e = Package()
for key, value in in_entry.iteritems():
- if isinstance(value, package_relation_list):
+ if isinstance(value, PackageRelationList):
self.process_relation(key, e, in_entry, vars)
elif key == 'Description':
self.process_description(e, in_entry, vars)
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 (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py Sun Jun 17 10:34:22 2007
@@ -1,21 +1,21 @@
import debian, re, textwrap
-class sorted_dict(dict):
+class SortedDict(dict):
__slots__ = '_list',
def __init__(self, entries = None):
- super(sorted_dict, self).__init__()
+ super(SortedDict, self).__init__()
self._list = []
if entries is not None:
for key, value in entries:
self[key] = value
def __delitem__(self, key):
- super(sorted_dict, self).__delitem__(key)
+ super(SortedDict, self).__delitem__(key)
self._list.remove(key)
def __setitem__(self, key, value):
- super(sorted_dict, self).__setitem__(key, value)
+ super(SortedDict, self).__setitem__(key, value)
if key not in self._list:
self._list.append(key)
@@ -31,50 +31,7 @@
for i in iter(self._list):
yield self[i]
-class field_list(list):
- TYPE_WHITESPACE = object()
- TYPE_COMMATA = object()
-
- def __init__(self, value = None, type = TYPE_WHITESPACE):
- self.type = type
- if isinstance(value, field_list):
- self.type = value.type
- self.extend(value)
- elif isinstance(value, (list, tuple)):
- self.extend(value)
- else:
- self._extend(value)
-
- def __str__(self):
- if self.type is self.TYPE_WHITESPACE:
- type = ' '
- elif self.type is self.TYPE_COMMATA:
- type = ', '
- return type.join(self)
-
- def _extend(self, value):
- if self.type is self.TYPE_WHITESPACE:
- type = '\s'
- elif self.type is self.TYPE_COMMATA:
- type = ','
- if value is not None:
- self.extend([j.strip() for j in re.split(type, value.strip())])
-
- def extend(self, value):
- if isinstance(value, str):
- self._extend(value)
- else:
- super(field_list, self).extend(value)
-
-class field_list_commata(field_list):
- def __init__(self, value = None):
- super(field_list_commata, self).__init__(value, field_list.TYPE_COMMATA)
-
-class field_string(str):
- def __str__(self):
- return '\n '.join(self.split('\n'))
-
-class templates(dict):
+class Templates(dict):
def __init__(self, dir = "debian/templates"):
self.dir = dir
@@ -94,15 +51,15 @@
f = file("%s/%s.in" % (self.dir, name))
if prefix == 'control':
- return self._read_control(f)
+ return self._readControl(f)
return f.read()
- def _read_control(self, f):
+ def _readControl(self, f):
entries = []
while True:
- e = debian.package()
+ e = debian.Package()
last = None
lines = []
while True:
@@ -133,7 +90,7 @@
return entries
-class wrap(textwrap.TextWrapper):
+class TextWrapper(textwrap.TextWrapper):
wordsep_re = re.compile(
r'(\s+|' # any whitespace
r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))') # em-dash
More information about the Kernel-svn-changes
mailing list