From 8cafaf07aecab45eec89336dd4054d68aed873e3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 1 Oct 2018 21:50:59 +0100 Subject: [PATCH] debian/bin, debian/lib/python: Delete write-only vars reported by pyflakes --- debian/bin/abiupdate.py | 2 -- debian/bin/gencontrol.py | 1 - debian/changelog | 1 + debian/lib/python/debian_linux/config.py | 4 +--- debian/lib/python/debian_linux/debian.py | 20 ++++++++++---------- debian/lib/python/debian_linux/gencontrol.py | 3 --- 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py index 4e88a0b4a..b1d98bb30 100755 --- a/debian/bin/abiupdate.py +++ b/debian/bin/abiupdate.py @@ -169,8 +169,6 @@ class Main(object): self.update_flavour(config, arch, featureset, flavour) def update_flavour(self, config, arch, featureset, flavour): - config_base = config.merge('base', arch, featureset, flavour) - self.log("Updating ABI for arch %s, featureset %s, flavour %s: " % (arch, featureset, flavour)) try: diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 480018e67..fa7db1b16 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -326,7 +326,6 @@ class Gencontrol(Base): (arch, makeflags)]) def do_featureset_setup(self, vars, makeflags, arch, featureset, extra): - config_base = self.config.merge('base', arch, featureset) vars['localversion_headers'] = vars['localversion'] makeflags['LOCALVERSION_HEADERS'] = vars['localversion_headers'] diff --git a/debian/changelog b/debian/changelog index 89ebe2120..362c6d729 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux (4.19~rc6-1~exp1) UNRELEASED; urgency=medium * debian/bin, debian/rules.real: Add symlink to Python package directory instead of editing path * debian/bin, debian/lib/python: Clean up imports based on pyflakes report + * debian/bin, debian/lib/python: Delete write-only vars reported by pyflakes -- Ben Hutchings Thu, 20 Sep 2018 02:40:54 +0100 diff --git a/debian/lib/python/debian_linux/config.py b/debian/lib/python/debian_linux/config.py index 430fbbc13..741a9cd3e 100644 --- a/debian/lib/python/debian_linux/config.py +++ b/debian/lib/python/debian_linux/config.py @@ -164,8 +164,6 @@ class ConfigCoreHierarchy(object): config = ConfigParser(self.schema) config.read(self.get_files(arch, featureset)) - flavours = config['base', ].get('flavours', []) - for section in iter(config): real = (section[-1], arch, featureset) + section[:-1] s = ret.get(real, {}) @@ -208,7 +206,7 @@ class ConfigParser(object): def __init__(self, schemas): self.schemas = schemas - self._config = config = RawConfigParser() + self._config = RawConfigParser() def __getitem__(self, key): return self._convert()[key] diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 453c189b4..5d1dda09f 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -195,29 +195,29 @@ class _VersionTest(unittest.TestCase): def test_invalid_epoch(self): with self.assertRaises(RuntimeError): - v = Version('a:1') + Version('a:1') with self.assertRaises(RuntimeError): - v = Version('-1:1') + Version('-1:1') with self.assertRaises(RuntimeError): - v = Version('1a:1') + Version('1a:1') def test_invalid_upstream(self): with self.assertRaises(RuntimeError): - v = Version('1_2') + Version('1_2') with self.assertRaises(RuntimeError): - v = Version('1/2') + Version('1/2') with self.assertRaises(RuntimeError): - v = Version('a1') + Version('a1') with self.assertRaises(RuntimeError): - v = Version('1 2') + Version('1 2') def test_invalid_revision(self): with self.assertRaises(RuntimeError): - v = Version('1-2_3') + Version('1-2_3') with self.assertRaises(RuntimeError): - v = Version('1-2/3') + Version('1-2/3') with self.assertRaises(RuntimeError): - v = Version('1-2:3') + Version('1-2:3') class VersionLinux(Version): diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index c9bd3efbc..6b464e580 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -103,7 +103,6 @@ class Gencontrol(object): packages['source'] = self.process_package(source, self.vars) def do_main(self, packages, makefile): - config_entry = self.config['base', ] vars = self.vars.copy() makeflags = MakeFlags() @@ -267,8 +266,6 @@ class Gencontrol(object): def do_flavour(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra): - config_base = self.config.merge('base', arch, featureset, flavour) - vars['localversion'] += '-' + flavour self.do_flavour_setup(vars, makeflags, arch, featureset, flavour,