From 40fb89213b1a232afc920a25692d054768858b3d Mon Sep 17 00:00:00 2001 From: persianpros Date: Tue, 13 Apr 2021 23:18:05 +0430 Subject: PEP8 double aggressive E301 ~ E306 Signed-off-by: Khem Raj (cherry picked from commit af6838a62c53dab71941b2cc31f0e32387cd30e0) Signed-off-by: Armin Kuster --- contrib/oe-stylize.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'contrib') diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index 9d95911ae6..cfabb90b10 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -221,41 +221,59 @@ for v in OE_vars: # _Format guideline #0_: # No spaces are allowed at the beginning of lines that define a variable or # a do_ routine + + def respect_rule0(line): return line.lstrip() == line + + def conformTo_rule0(line): return line.lstrip() # _Format guideline #1_: # No spaces are allowed behind the line continuation symbol '\' + + def respect_rule1(line): if line.rstrip().endswith('\\'): return line.endswith('\\') else: return True + + def conformTo_rule1(line): return line.rstrip() # _Format guideline #2_: # Tabs should not be used (use spaces instead). + + def respect_rule2(line): return line.count('\t') == 0 + + def conformTo_rule2(line): return line.expandtabs() # _Format guideline #3_: # Comments inside bb files are allowed using the '#' character at the # beginning of a line. + + def respect_rule3(line): if line.lstrip().startswith('#'): return line.startswith('#') else: return True + + def conformTo_rule3(line): return line.lstrip() # _Format guideline #4_: # Use quotes on the right hand side of assignments FOO = "BAR" + + def respect_rule4(line): r = re.search(varRegexp, line) if r is not None: @@ -263,33 +281,48 @@ def respect_rule4(line): # do not test for None it because always match return r2.group(1) == '"' and r2.group(3) != '' return False + + def conformTo_rule4(line): r = re.search(varRegexp, line) return ''.join([r.group(1), ' ', r.group(3), ' "', r.group(5), r.group(5).endswith('"') and '' or '"']) # _Format guideline #5_: # The correct spacing for a variable is FOO = "BAR". + + def respect_rule5(line): r = re.search(varRegexp, line) return r is not None and r.group(2) == " " and r.group(4) == " " + + def conformTo_rule5(line): r = re.search(varRegexp, line) return ''.join([r.group(1), ' ', r.group(3), ' ', r.group(5)]) # _Format guideline #6_: # Don't use spaces or tabs on empty lines + + def respect_rule6(line): return not line.isspace() or line == "\n" + + def conformTo_rule6(line): return "" # _Format guideline #7_: # Indentation of multiline variables such as SRC_URI is desireable. + + def respect_rule7(line): return True + + def conformTo_rule7(line): return line + rules = ( (respect_rule0, conformTo_rule0, "No spaces are allowed at the beginning of lines that define a variable or a do_ routine"), (respect_rule1, conformTo_rule1, "No spaces are allowed behind the line continuation symbol '\\'"), @@ -303,6 +336,8 @@ rules = ( # Function to check that a line respects a rule. If not, it tries to conform # the line to the rule. Reminder or Disgression message are dump accordingly. + + def follow_rule(i, line): oldline = line # if the line does not respect the rule -- cgit 1.2.3-korg