summaryrefslogtreecommitdiff
path: root/licensing
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2013-12-12 01:50:59 -0500
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2013-12-13 01:13:48 +0000
commit1a736a878a49515ab2198e3cba66ad5162791f7c (patch)
tree432ffb3a935bdf94d5faa20f9d14206bdb8cbaa8 /licensing
parent5b9551453b495666364a5c7b42562c7f68535a24 (diff)
downloadchromite-1a736a878a49515ab2198e3cba66ad5162791f7c.tar.gz
lint: clean up section names in docstrings
Make sure: - correct ordering - correct name usage - new lines before each section Maybe one or two other random fixes too like whitespace alignment. BUG=chromium:327969 TEST=`cros lint` doesn't complain as much TEST=`./buildbot/run_tests` passes Change-Id: Ia57f06d5c0709103b2373568989d03d8fbaceeb5 Reviewed-on: https://chromium-review.googlesource.com/179802 Reviewed-by: Matt Tennant <mtennant@chromium.org> Commit-Queue: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'licensing')
-rw-r--r--licensing/licenses.py7
-rwxr-xr-xlicensing/process-pkg.py5
2 files changed, 6 insertions, 6 deletions
diff --git a/licensing/licenses.py b/licensing/licenses.py
index 7999a6452..12ae0d833 100644
--- a/licensing/licenses.py
+++ b/licensing/licenses.py
@@ -1136,10 +1136,11 @@ def ReadUnknownEncodedFile(file_path, logging_text=None):
logging_text: what to display for logging depending on file read.
Returns:
- file content, possibly converted from latin1 to UTF-8.
+ File content, possibly converted from latin1 to UTF-8.
- Raises: Assertion error: if non-whitelisted illegal XML characters
- are found in the file.
+ Raises:
+ Assertion error: if non-whitelisted illegal XML characters
+ are found in the file.
"""
try:
diff --git a/licensing/process-pkg.py b/licensing/process-pkg.py
index c42c8d8d7..0ad845f22 100755
--- a/licensing/process-pkg.py
+++ b/licensing/process-pkg.py
@@ -265,12 +265,11 @@ def identifyLicenseText(workdir, metadata_licenses, stock_licenses):
license_text = _GetStockLicense(metadata_licenses, stock_licenses)
if not license_text:
raise Exception("failed finding a license in both the source, and a "
- "usable stock license")
+ "usable stock license")
return license_text
def EvaluateTemplate(template, env, escape=True):
- """Expand a template with variables like {{foo}} using a
- dictionary of expansions."""
+ """Expand |template| with content like {{foo}} using a dict of expansions."""
for key, val in env.items():
if escape:
val = cgi.escape(val)