[linux] 01/03: debian/bin, debian/control, debian/lib/python: Use Python 3
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sat Aug 29 22:59:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit 6b977589fb8820f76fe3a89093b4831bf6092106
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sat Aug 29 21:48:39 2015 +0100
debian/bin,debian/control,debian/lib/python: Use Python 3
---
debian/bin/abiupdate.py | 2 +-
debian/bin/buildcheck.py | 2 +-
debian/bin/gencontrol.py | 10 ++--
debian/bin/genorig.py | 2 +-
debian/bin/kconfig.py | 2 +-
debian/changelog | 1 +
debian/lib/python/debian_linux/debian.py | 78 ++++++++++++----------------
debian/lib/python/debian_linux/gencontrol.py | 7 ++-
debian/lib/python/debian_linux/utils.py | 4 +-
debian/templates/control.source.in | 2 +-
10 files changed, 49 insertions(+), 61 deletions(-)
diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py
index 2808b3f..74902be 100755
--- a/debian/bin/abiupdate.py
+++ b/debian/bin/abiupdate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import sys
sys.path.append(sys.path[0] + "/../lib/python")
diff --git a/debian/bin/buildcheck.py b/debian/bin/buildcheck.py
index 68bd342..07734a2 100755
--- a/debian/bin/buildcheck.py
+++ b/debian/bin/buildcheck.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import sys
sys.path.append('debian/lib/python')
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 7eaba6f..71fcd08 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import sys
sys.path.append("debian/lib/python")
@@ -160,9 +160,9 @@ class Gencontrol(Base):
if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
if self.changelog[0].distribution == 'UNRELEASED':
import warnings
- warnings.warn(u'Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
+ warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
else:
- raise RuntimeError(u'Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
+ raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
else:
# Add udebs using kernel-wedge
installer_def_dir = 'debian/installer'
@@ -344,10 +344,10 @@ class Gencontrol(Base):
if os.getenv('DEBIAN_KERNEL_DISABLE_DEBUG'):
if self.changelog[0].distribution == 'UNRELEASED':
import warnings
- warnings.warn(u'Disable debug infos on request (DEBIAN_KERNEL_DISABLE_DEBUG set)')
+ warnings.warn('Disable debug infos on request (DEBIAN_KERNEL_DISABLE_DEBUG set)')
build_debug = False
else:
- raise RuntimeError(u'Unable to disable debug infos in release build (DEBIAN_KERNEL_DISABLE_DEBUG set)')
+ raise RuntimeError('Unable to disable debug infos in release build (DEBIAN_KERNEL_DISABLE_DEBUG set)')
if build_debug:
makeflags['DEBUG'] = True
diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py
index 7fa9e8d..779690d 100755
--- a/debian/bin/genorig.py
+++ b/debian/bin/genorig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import sys
sys.path.append("debian/lib/python")
diff --git a/debian/bin/kconfig.py b/debian/bin/kconfig.py
index d503876..8158399 100755
--- a/debian/bin/kconfig.py
+++ b/debian/bin/kconfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import optparse
import os.path
diff --git a/debian/changelog b/debian/changelog
index 0cf49ec..11fe701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux (4.2~rc8-1~exp2) UNRELEASED; urgency=medium
are redundant with sparc64 and neither is an official port
* Fix last issue that prevents a reproducible build (Closes: #769844):
- DocBook: Use a fixed encoding for output
+ * debian/bin,debian/control,debian/lib/python: Use Python 3
-- Ben Hutchings <ben at decadent.org.uk> Tue, 25 Aug 2015 18:50:57 +0100
diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py
index 936a9ab..00db2c3 100644
--- a/debian/lib/python/debian_linux/debian.py
+++ b/debian/lib/python/debian_linux/debian.py
@@ -1,8 +1,6 @@
import collections
import os.path
import re
-import six
-import six.moves
from . import utils
@@ -36,10 +34,7 @@ class Changelog(list):
def __init__(self, dir='', version=None):
if version is None:
version = Version
- if six.PY3:
- f = open(os.path.join(dir, "debian/changelog"), encoding="UTF-8")
- else:
- f = open(os.path.join(dir, "debian/changelog"))
+ f = open(os.path.join(dir, "debian/changelog"), encoding="UTF-8")
while True:
line = f.readline()
if not line:
@@ -88,7 +83,6 @@ $
def __str__(self):
return self.complete
- __unicode__ = __str__
@property
def complete(self):
@@ -164,7 +158,7 @@ $
self.linux_version = d['version']
if d['modifier'] is not None:
assert not d['update']
- self.linux_upstream = u'-'.join((d['version'], d['modifier']))
+ self.linux_upstream = '-'.join((d['version'], d['modifier']))
else:
self.linux_upstream = d['version']
self.linux_upstream_full = self.linux_upstream + d['update']
@@ -193,8 +187,7 @@ class PackageArchitecture(collections.MutableSet):
return self._data.__len__()
def __str__(self):
- return u' '.join(sorted(self))
- __unicode__ = __str__
+ return ' '.join(sorted(self))
def add(self, value):
self._data.add(value)
@@ -203,7 +196,7 @@ class PackageArchitecture(collections.MutableSet):
self._data.discard(value)
def extend(self, value):
- if isinstance(value, six.string_types):
+ if isinstance(value, str):
for i in re.split('\s', value.strip()):
self.add(i)
else:
@@ -223,13 +216,12 @@ class PackageDescription(object):
def __str__(self):
wrap = utils.TextWrapper(width=74, fix_sentence_endings=True).wrap
- short = u', '.join(self.short)
+ short = ', '.join(self.short)
long_pars = []
for i in self.long:
long_pars.append(wrap(i))
- long = u'\n .\n '.join([u'\n '.join(i) for i in long_pars])
- return short + u'\n ' + long
- __unicode__ = __str__
+ long = '\n .\n '.join(['\n '.join(i) for i in long_pars])
+ return short + '\n ' + long
def append(self, str):
str = str.strip()
@@ -255,8 +247,7 @@ class PackageRelation(list):
self.extend(value, override_arches)
def __str__(self):
- return u', '.join(six.text_type(i) for i in self)
- __unicode__ = __str__
+ return ', '.join(str(i) for i in self)
def _search_value(self, value):
for i in self:
@@ -265,7 +256,7 @@ class PackageRelation(list):
return None
def append(self, value, override_arches=None):
- if isinstance(value, six.string_types):
+ if isinstance(value, str):
value = PackageRelationGroup(value, override_arches)
elif not isinstance(value, PackageRelationGroup):
raise ValueError(u"got %s" % type(value))
@@ -276,8 +267,8 @@ class PackageRelation(list):
super(PackageRelation, self).append(value)
def extend(self, value, override_arches=None):
- if isinstance(value, six.string_types):
- value = (j.strip() for j in re.split(u',', value.strip()))
+ if isinstance(value, str):
+ value = (j.strip() for j in re.split(',', value.strip()))
for i in value:
self.append(i, override_arches)
@@ -288,31 +279,30 @@ class PackageRelationGroup(list):
self.extend(value, override_arches)
def __str__(self):
- return u' | '.join(six.text_type(i) for i in self)
- __unicode__ = __str__
+ return ' | '.join(str(i) for i in self)
def _search_value(self, value):
- for i, j in six.moves.zip(self, value):
+ for i, j in zip(self, value):
if i.name != j.name or i.version != j.version:
return None
return self
def _update_arches(self, value):
- for i, j in six.moves.zip(self, value):
+ for i, j in zip(self, value):
if i.arches:
for arch in j.arches:
if arch not in i.arches:
i.arches.append(arch)
def append(self, value, override_arches=None):
- if isinstance(value, six.string_types):
+ if isinstance(value, str):
value = PackageRelationEntry(value, override_arches)
elif not isinstance(value, PackageRelationEntry):
raise ValueError
super(PackageRelationGroup, self).append(value)
def extend(self, value, override_arches=None):
- if isinstance(value, six.string_types):
+ if isinstance(value, str):
value = (j.strip() for j in re.split('\|', value.strip()))
for i in value:
self.append(i, override_arches)
@@ -332,12 +322,12 @@ class PackageRelationEntry(object):
OP_GT = 6
operators = {
- u'<<': OP_LT,
- u'<=': OP_LE,
- u'=': OP_EQ,
- u'!=': OP_NE,
- u'>=': OP_GE,
- u'>>': OP_GT,
+ '<<': OP_LT,
+ '<=': OP_LE,
+ '=': OP_EQ,
+ '!=': OP_NE,
+ '>=': OP_GE,
+ '>>': OP_GT,
}
operators_neg = {
@@ -361,10 +351,9 @@ class PackageRelationEntry(object):
def __str__(self):
return self.operators_text[self._op]
- __unicode__ = __str__
def __init__(self, value=None, override_arches=None):
- if not isinstance(value, six.string_types):
+ if not isinstance(value, str):
raise ValueError
self.parse(value)
@@ -375,11 +364,10 @@ class PackageRelationEntry(object):
def __str__(self):
ret = [self.name]
if self.operator is not None and self.version is not None:
- ret.extend((u' (', six.text_type(self.operator), u' ', self.version, u')'))
+ ret.extend((' (', str(self.operator), ' ', self.version, ')'))
if self.arches:
- ret.extend((u' [', u' '.join(self.arches), u']'))
- return u''.join(ret)
- __unicode__ = __str__
+ ret.extend((' [', ' '.join(self.arches), ']'))
+ return ''.join(ret)
def parse(self, value):
match = self._re.match(value)
@@ -400,14 +388,14 @@ class PackageRelationEntry(object):
class Package(dict):
_fields = collections.OrderedDict((
- ('Package', six.text_type),
- ('Source', six.text_type),
+ ('Package', str),
+ ('Source', str),
('Architecture', PackageArchitecture),
- ('Section', six.text_type),
- ('Priority', six.text_type),
- ('Maintainer', six.text_type),
- ('Uploaders', six.text_type),
- ('Standards-Version', six.text_type),
+ ('Section', str),
+ ('Priority', str),
+ ('Maintainer', str),
+ ('Uploaders', str),
+ ('Standards-Version', str),
('Build-Depends', PackageRelation),
('Build-Depends-Indep', PackageRelation),
('Provides', PackageRelation),
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index 62093ad..ec139ff 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -1,5 +1,4 @@
import codecs
-import six
from collections import OrderedDict
from .debian import *
@@ -141,7 +140,7 @@ class Gencontrol(object):
cmds = []
for i in extra_arches[arch]:
cmds.append("$(MAKE) -f debian/rules.real install-dummy ARCH='%s' DH_OPTIONS='-p%s'" % (arch, i['Package']))
- makefile.add('binary-arch_%s' % arch, [u'binary-arch_%s_extra' % arch])
+ makefile.add('binary-arch_%s' % arch, ['binary-arch_%s_extra' % arch])
makefile.add("binary-arch_%s_extra" % arch, cmds = cmds)
def do_arch(self, packages, makefile, arch, vars, makeflags, extra):
@@ -275,7 +274,7 @@ class Gencontrol(object):
def subst(match):
return vars[match.group(1)]
- return re.sub(r'@([-_a-z0-9]+)@', subst, six.text_type(s))
+ return re.sub(r'@([-_a-z0-9]+)@', subst, str(s))
def write(self, packages, makefile):
self.write_control(packages.values())
@@ -298,4 +297,4 @@ class Gencontrol(object):
for entry in list:
for key, value in entry.iteritems():
f.write(u"%s: %s\n" % (key, value))
- f.write(u'\n')
+ f.write('\n')
diff --git a/debian/lib/python/debian_linux/utils.py b/debian/lib/python/debian_linux/utils.py
index 454d7c8..5f34b6e 100644
--- a/debian/lib/python/debian_linux/utils.py
+++ b/debian/lib/python/debian_linux/utils.py
@@ -58,11 +58,11 @@ def read_control(f):
break
if line[0] in ' \t':
if not last:
- raise ValueError(u'Continuation line seen before first header')
+ raise ValueError('Continuation line seen before first header')
lines.append(line.lstrip())
continue
if last:
- e[last] = u'\n'.join(lines)
+ e[last] = '\n'.join(lines)
i = line.find(':')
if i < 0:
raise ValueError(u"Not a header, not a continuation: ``%s''" % line)
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index dcaf8b1..485baff 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Uploaders: Bastian Blank <waldi at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
Standards-Version: 3.9.5
-Build-Depends: debhelper, cpio, kmod, python, python-six, xz-utils, kernel-wedge, quilt, patchutils, bc
+Build-Depends: debhelper, cpio, kmod, python3, xz-utils, kernel-wedge, quilt, patchutils, bc
Build-Depends-Indep: xmlto
Vcs-Git: https://anonscm.debian.org/git/kernel/linux.git
Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux.git
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list