[devscripts] 01/04: Fix all PEP-8 and pyflakes warnings
Benjamin Drung
bdrung at moszumanska.debian.org
Thu Jan 15 21:45:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
bdrung pushed a commit to branch master
in repository devscripts.
commit 2fe71a967a1ee2f519a272e31a98e75bb2f5dc6d
Author: Benjamin Drung <bdrung at debian.org>
Date: Thu Jan 15 22:38:52 2015 +0100
Fix all PEP-8 and pyflakes warnings
---
scripts/devscripts/control.py | 2 ++
scripts/devscripts/test/__init__.py | 1 +
scripts/devscripts/test/test_help.py | 2 ++
scripts/devscripts/test/test_pylint.py | 1 +
scripts/setup.py | 23 +++++++++++------------
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/scripts/devscripts/control.py b/scripts/devscripts/control.py
index 8dbff26..4618d52 100644
--- a/scripts/devscripts/control.py
+++ b/scripts/devscripts/control.py
@@ -27,6 +27,7 @@ except ImportError:
Logger.error("Please install 'python3-debian' in order to use this utility.")
sys.exit(1)
+
def _insert_after(paragraph, item_before, new_item, new_value):
"""Insert new_item into directly after item_before
@@ -42,6 +43,7 @@ def _insert_after(paragraph, item_before, new_item, new_value):
if not item_found:
paragraph[new_item] = new_value
+
class Control(object):
"""Represents a debian/control file"""
diff --git a/scripts/devscripts/test/__init__.py b/scripts/devscripts/test/__init__.py
index 5337afb..f19955c 100644
--- a/scripts/devscripts/test/__init__.py
+++ b/scripts/devscripts/test/__init__.py
@@ -22,6 +22,7 @@ if sys.version_info < (2, 7):
else:
import unittest
+
def discover():
# import __main__ triggers code re-execution
__main__ = sys.modules['__main__']
diff --git a/scripts/devscripts/test/test_help.py b/scripts/devscripts/test/test_help.py
index 3673b14..33ceb03 100644
--- a/scripts/devscripts/test/test_help.py
+++ b/scripts/devscripts/test/test_help.py
@@ -26,6 +26,7 @@ from devscripts.test import unittest
TIMEOUT = 5
+
def load_tests(loader, tests, pattern):
"Give HelpTestCase a chance to populate before loading its test cases"
suite = unittest.TestSuite()
@@ -33,6 +34,7 @@ def load_tests(loader, tests, pattern):
suite.addTests(loader.loadTestsFromTestCase(HelpTestCase))
return suite
+
class HelpTestCase(unittest.TestCase):
@classmethod
def populate(cls):
diff --git a/scripts/devscripts/test/test_pylint.py b/scripts/devscripts/test/test_pylint.py
index 3205bd3..3671725 100644
--- a/scripts/devscripts/test/test_pylint.py
+++ b/scripts/devscripts/test/test_pylint.py
@@ -30,6 +30,7 @@ WHITELIST = [re.compile(': %s$' % x) for x in (
r"member",
)]
+
class PylintTestCase(unittest.TestCase):
def test_pylint(self):
"Test: Run pylint on Python source code"
diff --git a/scripts/setup.py b/scripts/setup.py
index 2978800..e376d07 100755
--- a/scripts/setup.py
+++ b/scripts/setup.py
@@ -1,7 +1,6 @@
#!/usr/bin/python3
from setuptools import setup
-import glob
import os
import re
@@ -13,17 +12,17 @@ if os.path.exists(changelog):
if match:
version = match.group(1)
-scripts = ['sadt',
- 'suspicious-source',
- 'wrap-and-sort',
- ]
+scripts = [
+ 'sadt',
+ 'suspicious-source',
+ 'wrap-and-sort',
+]
if __name__ == '__main__':
- setup(name='devscripts',
- version=version,
- scripts=scripts,
- packages=['devscripts',
- 'devscripts/test',
- ],
- test_suite='devscripts.test.discover',
+ setup(
+ name='devscripts',
+ version=version,
+ scripts=scripts,
+ packages=['devscripts', 'devscripts/test'],
+ test_suite='devscripts.test.discover',
)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list