From 6ec7b8da05d21a3878bd21c691b41e675d74bb1c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 17 Jul 2017 13:57:45 +0200 Subject: BASELINE: Update Chromium to 60.0.3112.70 Change-Id: I9911c2280a014d4632f254857876a395d4baed2d Reviewed-by: Alexandru Croitor --- chromium/styleguide/styleguide.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'chromium/styleguide/styleguide.md') diff --git a/chromium/styleguide/styleguide.md b/chromium/styleguide/styleguide.md index 85f792daa37..1a24bb5e957 100644 --- a/chromium/styleguide/styleguide.md +++ b/chromium/styleguide/styleguide.md @@ -17,15 +17,17 @@ Regardless of the language used, please keep code [gender neutral](gender_neutra ## Python -Python code should follow [PEP-8](https://www.python.org/dev/peps/pep-0008/). - -Some existing scripts were originally written following Google's internal -style guideline and have the following two exceptions. New scripts should, -however, be PEP-8 compliant. +Python code should follow [PEP-8](https://www.python.org/dev/peps/pep-0008/), +except: * Use two-space indentation instead of four-space indentation. * Use `CamelCase()` method and function names instead of `unix_hacker_style()` names. +(The rationale for these is mostly legacy: the code was originally written +following Google's internal style guideline, the cost of updating all of the +code to PEP-8 compliance was not small, and consistency was seen to be a +greater virtue than compliance.) + [Depot tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools.html) contains a local copy of pylint, appropriately configured. @@ -41,6 +43,6 @@ Guidelines](https://sites.google.com/a/chromium.org/dev/chromium-os/python-style ## Web languages (JavaScript, HTML, CSS) -When working on Web-based UI features, consult the [Web Development Style Guide](https://sites.google.com/a/chromium.org/dev/developers/web-development-style-guide) for the Chromium conventions used in JS/CSS/HTML files. +When working on Web-based UI features, consult the [Web Development Style Guide](web/web.md) for the Chromium conventions used in JS/CSS/HTML files. Internal uses of web languages, notably "layout" tests, should preferably follow these style guides, but it is not enforced. -- cgit v1.2.1