Fix some style/lint issues. (#10003)
- Starlark: ensure docstrings are present.
- python/setup.py: https://refex.readthedocs.io/en/latest/guide/fixers/superfluous_parens.html
diff --git a/build_defs/cpp_opts.bzl b/build_defs/cpp_opts.bzl
index f868c4a..94966e3 100644
--- a/build_defs/cpp_opts.bzl
+++ b/build_defs/cpp_opts.bzl
@@ -1,4 +1,4 @@
-# C++ compile/link options for Protobuf.
+"""C++ compile/link options for Protobuf libraries."""
COPTS = select({
"//build_defs:config_msvc": [
diff --git a/conformance/defs.bzl b/conformance/defs.bzl
index 905953a..cd36ab4 100644
--- a/conformance/defs.bzl
+++ b/conformance/defs.bzl
@@ -1,6 +1,22 @@
-# PLEASE DO NOT DEPEND ON THE CONTENTS OF THIS FILE, IT IS UNSTABLE.
+"""Starlark definitions for Protobuf conformance tests.
-def conformance_test(name, testee, failure_list = None, text_format_failure_list = None):
+PLEASE DO NOT DEPEND ON THE CONTENTS OF THIS FILE, IT IS UNSTABLE.
+"""
+
+def conformance_test(
+ name,
+ testee,
+ failure_list = None,
+ text_format_failure_list = None):
+ """Conformance test runner.
+
+ Args:
+ name: the name for the test.
+ testee: a conformance test client binary.
+ failure_list: a text file with known failures, one per line.
+ text_format_failure_list: a text file with known failures (one per line)
+ for the text format conformance suite.
+ """
args = ["--testee %s" % _strip_bazel(testee)]
failure_lists = []
if failure_list:
diff --git a/python/setup.py b/python/setup.py
index 380c7d8..302c82b 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -209,7 +209,7 @@
# Python 2.6 dodges these extra failures.
os.environ['CONFORMANCE_PYTHON_EXTRA_FAILURES'] = (
'--failure_list failure_list_python-post26.txt')
- cmd = 'cd ../conformance && make %s' % (TestConformanceCmd.target)
+ cmd = 'cd ../conformance && make %s' % (TestConformanceCmd.target,)
subprocess.check_call(cmd, shell=True)
@@ -227,7 +227,7 @@
flag_res = [re.compile(r'--?%s(=(.*))?' %
(flag_long[:-1] if expect_value else flag_long))]
if flag_short:
- flag_res.append(re.compile(r'-%s(.*)?' % (flag_short)))
+ flag_res.append(re.compile(r'-%s(.*)?' % (flag_short,)))
flag_match = None
for arg in sys.argv:
