The current flake8 check only looks at one item (semicolons at end of line). This means that our code quality will continue to get worse, violating an increasing number of checks. Switching to a whitelist means that we freeze the badness at its current level & can incrementally fix things up. We are excluding the folllowing... Indentation: E114 indentation is not a multiple of four (comment) E115 expected an indented block (comment) E116 unexpected indentation (comment) E121 continuation line under-indented for hanging indent E125 continuation line with same indent as next logical line E126 continuation line over-indented for hanging indent E127 continuation line over-indented for visual indent E128 continuation line under-indented for visual indent E129 visually indented line with same indent as next logical line E131 continuation line unaligned for hanging indent Whitespace: E211 whitespace before ‘(‘ E221 multiple spaces before operator E222 multiple spaces after operator E225 missing whitespace around operator E226 missing whitespace around arithmetic operator E231 missing whitespace after ‘,’, ‘;’, or ‘:’ E261 at least two spaces before inline comment Blank lines E301 expected 1 blank line, found 0 E302 expected 2 blank lines, found 0 E303 too many blank lines (3) E305 expected 2 blank lines after end of function or class Line length E501 line too long (82 > 79 characters) Statements E722 do not use bare except, specify exception instead E741 do not use variables named ‘l’, ‘O’, or ‘I’ Errors: F821 undefined name 'name' Warnings: W504 line break after binary operator W605 invalid escape sequence ‘x’ Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- build-aux/syntax-check.mk | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 8345703b3e..1ad0c626e1 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -878,11 +878,28 @@ sc_require_enum_last_marker: { echo '$(ME): enum impl needs _LAST marker on second line' 1>&2; \ exit 1; } || : -# In Python files we don't want to end lines with a semicolon like in C +# Validate many python style rules +FLAKE8_INDENTATION = E114,E115,E116,E121,E125,E126,E127,E128,E129,E131 +FLAKE8_WHITESPACE = E211,E221,E222,E225,E226,E231,E261 +FLAKE8_BLANK_LINES = E301,E302,E303,E305 +FLAKE8_LINE_LENGTH = E501 +FLAKE8_STATEMENTS = E722,E741 +FLAKE8_ERRORS = F821 +FLAKE8_WARNINGS = W504,W605 + +FLAKE8_IGNORE = $(FLAKE8_INDENTATION),$\ + $(FLAKE8_WHITESPACE),$\ + $(FLAKE8_BLANK_LINES),$\ + $(FLAKE8_LINE_LENGTH),$\ + $(FLAKE8_STATEMENTS),$\ + $(FLAKE8_ERRORS),$\ + $(FLAKE8_WARNINGS) \ + $(NULL) + sc_flake8: @if [ -n "$(FLAKE8)" ]; then \ $(VC_LIST_EXCEPT) | $(GREP) '\.py$$' | xargs \ - $(FLAKE8) --select E703 --show-source; \ + $(FLAKE8) --ignore $(FLAKE8_IGNORE) --show-source; \ else \ echo '$(ME): skipping test $@: flake8 not installed' 1>&2; \ fi -- 2.21.0

docs/apibuild.py:2436:65: F821 undefined name 'first_letter' chunks.append(["chunk%s" % (chunk - 1), first_letter, letter]) ^ src/hyperv/hyperv_wmi_generator.py:415:57: F821 undefined name 'number' report_error("line %d: invalid block header" % (number)) ^ Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- build-aux/syntax-check.mk | 2 -- docs/apibuild.py | 1 + src/hyperv/hyperv_wmi_generator.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 1ad0c626e1..97255908b8 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -884,7 +884,6 @@ FLAKE8_WHITESPACE = E211,E221,E222,E225,E226,E231,E261 FLAKE8_BLANK_LINES = E301,E302,E303,E305 FLAKE8_LINE_LENGTH = E501 FLAKE8_STATEMENTS = E722,E741 -FLAKE8_ERRORS = F821 FLAKE8_WARNINGS = W504,W605 FLAKE8_IGNORE = $(FLAKE8_INDENTATION),$\ @@ -892,7 +891,6 @@ FLAKE8_IGNORE = $(FLAKE8_INDENTATION),$\ $(FLAKE8_BLANK_LINES),$\ $(FLAKE8_LINE_LENGTH),$\ $(FLAKE8_STATEMENTS),$\ - $(FLAKE8_ERRORS),$\ $(FLAKE8_WARNINGS) \ $(NULL) diff --git a/docs/apibuild.py b/docs/apibuild.py index 3f0b72d18e..dc52caf76d 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2401,6 +2401,7 @@ class docBuilder: count = 0 chunk = 0 chunks = [] + first_letter = None for id in typ: if len(index[id]) > 30: continue diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index a9ece0ff00..4f486913bd 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -407,7 +407,7 @@ def report_error(message): -def parse_class(block): +def parse_class(block, number): # expected format: class <name> header_items = block[0][1].split() @@ -489,7 +489,7 @@ def main(): if block is not None: if line == "end": if block[0][1].startswith("class"): - parse_class(block) + parse_class(block, number) block = None else: -- 2.21.0

Python code style recommends avoiding a variable named 'l' as it is visually similar to '1'. docs/apibuild.py:482:13: E741 ambiguous variable name 'l' l = len(line) ^ docs/apibuild.py:503:21: E741 ambiguous variable name 'l' l = len(line) ^ ...more... Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- build-aux/syntax-check.mk | 2 +- docs/apibuild.py | 100 +++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index acd3f96c6d..b138220b30 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -883,7 +883,7 @@ FLAKE8_INDENTATION = E114,E115,E116,E121,E125,E126,E127,E128,E129,E131 FLAKE8_WHITESPACE = E211,E221,E222,E225,E226,E231,E261 FLAKE8_BLANK_LINES = E301,E302,E303,E305 FLAKE8_LINE_LENGTH = E501 -FLAKE8_STATEMENTS = E722,E741 +FLAKE8_STATEMENTS = E722 FLAKE8_WARNINGS = W504 FLAKE8_IGNORE = $(FLAKE8_INDENTATION),$\ diff --git a/docs/apibuild.py b/docs/apibuild.py index 18dc3604d0..b3ef462565 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -479,7 +479,7 @@ class CLexer: self.tokens[0] = ('preproc', "#" + self.tokens[1][1]) del self.tokens[1] break - l = len(line) + nline = len(line) if line[0] == '"' or line[0] == "'": quote = line[0] i = 1 @@ -500,12 +500,12 @@ class CLexer: tok = "" while found == 0: i = 0 - l = len(line) - while i < l: - if line[i] == '*' and i+1 < l and line[i+1] == '/': + nline = len(line) + while i < nline: + if line[i] == '*' and i+1 < nline and line[i+1] == '/': self.line = line[i+2:] line = line[:i-1] - l = i + nline = i found = 1 break i = i + 1 @@ -523,12 +523,12 @@ class CLexer: self.last = ('comment', line) return self.last i = 0 - while i < l: - if line[i] == '/' and i+1 < l and line[i+1] == '/': + while i < nline: + if line[i] == '/' and i+1 < nline and line[i+1] == '/': self.line = line[i:] line = line[:i] break - if line[i] == '/' and i+1 < l and line[i+1] == '*': + if line[i] == '/' and i+1 < nline and line[i+1] == '*': self.line = line[i:] line = line[:i] break @@ -537,15 +537,15 @@ class CLexer: line = line[:i] break i = i + 1 - l = len(line) + nline = len(line) i = 0 - while i < l: + while i < nline: if line[i] == ' ' or line[i] == '\t': i = i + 1 continue if line[i].isalnum(): s = i - while i < l: + while i < nline: if line[i] not in " \t(){}:;,+-*/%&!|[]=><": i = i + 1 else: @@ -557,14 +557,14 @@ class CLexer: i = i + 1 continue if line[i] in "+-*><=/%&!|.": - if line[i] == '.' and i + 2 < l and \ + if line[i] == '.' and i + 2 < nline and \ line[i+1] == '.' and line[i+2] == '.': self.tokens.append(('name', '...')) i = i + 3 continue j = i + 1 - if j < l and line[j] in "+-*><=/%&!|": + if j < nline and line[j] in "+-*><=/%&!|": self.tokens.append(('op', line[i:j+1])) i = j + 1 else: @@ -572,7 +572,7 @@ class CLexer: i = i + 1 continue s = i - while i < l: + while i < nline: if line[i] not in " \t(){}:;,+-*/%&!|[]=><": i = i + 1 else: @@ -779,9 +779,9 @@ class CParser: while lines[0] == '*': del lines[0] while len(lines) > 0 and lines[0][0:3] == '* @': - l = lines[0][3:] + prefix = lines[0][3:] try: - arg, desc = l.split(':', 1) + arg, desc = prefix.split(':', 1) desc = desc.strip() arg = arg.strip() except: @@ -791,25 +791,25 @@ class CParser: del lines[0] continue del lines[0] - l = lines[0].strip() - while len(l) > 2 and l[0:3] != '* @': - while l[0] == '*': - l = l[1:] - desc = desc + ' ' + l.strip() + line = lines[0].strip() + while len(line) > 2 and line[0:3] != '* @': + while line[0] == '*': + line = line[1:] + desc = desc + ' ' + line.strip() del lines[0] if len(lines) == 0: break - l = lines[0] + line = lines[0] args.append((arg, desc)) while len(lines) > 0 and lines[0] == '*': del lines[0] desc = "" while len(lines) > 0: - l = lines[0] - while len(l) > 0 and l[0] == '*': - l = l[1:] - l = l.strip() - desc = desc + " " + l + line = lines[0] + while len(line) > 0 and line[0] == '*': + line = line[1:] + line = line.strip() + desc = desc + " " + line del lines[0] desc = desc.strip() @@ -860,9 +860,9 @@ class CParser: del lines[0] nbargs = len(args) while len(lines) > 0 and lines[0][0:3] == '* @': - l = lines[0][3:] + prefix = lines[0][3:] try: - arg, desc = l.split(':', 1) + arg, desc = prefix.split(':', 1) desc = desc.strip() arg = arg.strip() except: @@ -872,15 +872,15 @@ class CParser: del lines[0] continue del lines[0] - l = lines[0].strip() - while len(l) > 2 and l[0:3] != '* @': - while l[0] == '*': - l = l[1:] - desc = desc + ' ' + l.strip() + line = lines[0].strip() + while len(line) > 2 and line[0:3] != '* @': + while line[0] == '*': + line = line[1:] + desc = desc + ' ' + line.strip() del lines[0] if len(lines) == 0: break - l = lines[0] + line = lines[0] i = 0 while i < nbargs: if args[i][1] == arg: @@ -895,35 +895,35 @@ class CParser: del lines[0] desc = None while len(lines) > 0: - l = lines[0] + line = lines[0] i = 0 # Remove all leading '*', followed by at most one ' ' character # since we need to preserve correct indentation of code examples - while i < len(l) and l[i] == '*': + while i < len(line) and line[i] == '*': i = i + 1 if i > 0: - if i < len(l) and l[i] == ' ': + if i < len(line) and line[i] == ' ': i = i + 1 - l = l[i:] - if len(l) >= 6 and l[0:7] == "Returns": + line = line[i:] + if len(line) >= 6 and line[0:7] == "Returns": try: - l = l.split(' ', 1)[1] + line = line.split(' ', 1)[1] except: - l = "" - retdesc = l.strip() + line = "" + retdesc = line.strip() del lines[0] while len(lines) > 0: - l = lines[0] - while len(l) > 0 and l[0] == '*': - l = l[1:] - l = l.strip() - retdesc = retdesc + " " + l + line = lines[0] + while len(line) > 0 and line[0] == '*': + line = line[1:] + line = line.strip() + retdesc = retdesc + " " + line del lines[0] else: if desc is not None: - desc = desc + "\n" + l + desc = desc + "\n" + line else: - desc = l + desc = line del lines[0] if desc is None: -- 2.21.0

Coding style expects 1 blank line between each method and 2 blank lines before each class. docs/apibuild.py:171:5: E303 too many blank lines (2) def set_header(self, header): ^ docs/apibuild.py:230:1: E302 expected 2 blank lines, found 1 class index: ^ docs/apibuild.py:175:5: E301 expected 1 blank line, found 0 def set_module(self, module): ^ ...more... Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- build-aux/syntax-check.mk | 2 - docs/apibuild.py | 26 ++++++++-- docs/reformat-news.py | 1 + src/esx/esx_vi_generator.py | 81 ------------------------------ src/hyperv/hyperv_wmi_generator.py | 23 +-------- tests/cputestdata/cpu-cpuid.py | 1 + 6 files changed, 25 insertions(+), 109 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index c66183c1b0..c6d7ad1b9d 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -881,13 +881,11 @@ sc_require_enum_last_marker: # Validate many python style rules FLAKE8_INDENTATION = E114,E115,E116,E121,E125,E126,E127,E128,E129,E131 FLAKE8_WHITESPACE = E211,E221,E222,E225,E226,E231,E261 -FLAKE8_BLANK_LINES = E301,E302,E303,E305 FLAKE8_LINE_LENGTH = E501 FLAKE8_WARNINGS = W504 FLAKE8_IGNORE = $(FLAKE8_INDENTATION),$\ $(FLAKE8_WHITESPACE),$\ - $(FLAKE8_BLANK_LINES),$\ $(FLAKE8_LINE_LENGTH),$\ $(FLAKE8_WARNINGS) \ $(NULL) diff --git a/docs/apibuild.py b/docs/apibuild.py index 86163c20b1..e944c01321 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -123,6 +123,7 @@ hidden_macros = { "VIR_EXPORT_VAR": "internal macro to mark exported vars", } + def escape(raw): raw = raw.replace('&', '&amp;') raw = raw.replace('<', '&lt;') @@ -131,9 +132,11 @@ def escape(raw): raw = raw.replace('"', '&quot;') return raw + def uniq(items): return sorted(set(items)) + class identifier: def __init__(self, name, header=None, module=None, type=None, lineno=0, info=None, extra=None, conditionals=None): @@ -167,21 +170,27 @@ class identifier: r = r + " " + repr(self.conditionals) return r - def set_header(self, header): self.header = header + def set_module(self, module): self.module = module + def set_type(self, type): self.type = type + def set_info(self, info): self.info = info + def set_extra(self, extra): self.extra = extra + def set_lineno(self, lineno): self.lineno = lineno + def set_static(self, static): self.static = static + def set_conditionals(self, conditionals): if conditionals is None or len(conditionals) == 0: self.conditionals = None @@ -190,20 +199,28 @@ class identifier: def get_name(self): return self.name + def get_header(self): return self.module + def get_module(self): return self.module + def get_type(self): return self.type + def get_info(self): return self.info + def get_lineno(self): return self.lineno + def get_extra(self): return self.extra + def get_static(self): return self.static + def get_conditionals(self): return self.conditionals @@ -225,6 +242,7 @@ class identifier: if conditionals is not None: self.set_conditionals(conditionals) + class index: def __init__(self, name="noname"): self.name = name @@ -409,7 +427,6 @@ class index: elif count != 0: print(" %d public %s" % (count, type)) - def analyze(self): if not quiet: self.analyze_dict("functions", self.functions) @@ -419,6 +436,7 @@ class index: self.analyze_dict("typedefs", self.typedefs) self.analyze_dict("macros", self.macros) + class CLexer: """A lexer for the C language, tokenize the input by reading and analyzing it line by line""" @@ -584,6 +602,7 @@ class CLexer: self.last = tok return tok + class CParser: """The C module parser""" def __init__(self, filename, idx=None): @@ -745,6 +764,7 @@ class CParser: % name) return desc + # # Parse a comment block associate to a macro # @@ -945,7 +965,6 @@ class CParser: if desc == "": self.warning("Function comment for %s lacks description of the function" % name) - return (ret[0], retdesc), args, desc def parsePreproc(self, token): @@ -1434,7 +1453,6 @@ class CParser: if token[0] == "comment": token = self.token() - if token[0] == "sep" and token[1] == ';': token = self.token() diff --git a/docs/reformat-news.py b/docs/reformat-news.py index 955ce2d45b..a06f945c02 100755 --- a/docs/reformat-news.py +++ b/docs/reformat-news.py @@ -24,6 +24,7 @@ import sys COLUMNS = 80 + def reformat_with_indent(text, initial_indent, indent): res = "" diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 28d440a6df..2310b56ad0 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -29,7 +29,6 @@ import os import os.path - OCCURRENCE__REQUIRED_ITEM = "r" OCCURRENCE__REQUIRED_LIST = "rl" OCCURRENCE__OPTIONAL_ITEM = "o" @@ -47,30 +46,24 @@ autobind_names = set() separator = "/* " + ("* " * 37) + "*\n" - def aligned(left, right, length=59): return left.ljust(length, ' ') + right - class Member: def __init__(self, type, occurrence): self.type = type self.occurrence = occurrence - def is_enum(self): return self.type in predefined_enums or self.type in enums_by_name - def is_object(self): return self.type in predefined_objects or self.type in objects_by_name - def is_type_generated(self): return self.type in enums_by_name or self.type in objects_by_name - def get_occurrence_comment(self): occurrence_map = { OCCURRENCE__REQUIRED_ITEM: "/* required */", @@ -84,8 +77,6 @@ class Member: raise ValueError("unknown occurrence value '%s'" % self.occurrence) - - class Parameter(Member): def __init__(self, type, name, occurrence): Member.__init__(self, type, occurrence) @@ -96,7 +87,6 @@ class Parameter(Member): self.name = name self.autobind_name = None - def generate_parameter(self, is_last=False, is_header=True, offset=0): if self.occurrence == OCCURRENCE__IGNORED: raise ValueError("invalid function parameter occurrence value '%s'" @@ -118,7 +108,6 @@ class Parameter(Member): return aligned(string, self.get_occurrence_comment() + "\n") - def generate_return(self, offset=0, end_of_line=";"): if self.occurrence == OCCURRENCE__IGNORED: raise ValueError("invalid function parameter occurrence value '%s'" @@ -131,7 +120,6 @@ class Parameter(Member): return aligned(string, self.get_occurrence_comment() + "\n") - def generate_require_code(self): if self.occurrence in [OCCURRENCE__REQUIRED_ITEM, OCCURRENCE__REQUIRED_LIST]: @@ -139,7 +127,6 @@ class Parameter(Member): else: return "" - def generate_serialize_code(self): if self.occurrence in [OCCURRENCE__REQUIRED_LIST, OCCURRENCE__OPTIONAL_LIST]: @@ -152,7 +139,6 @@ class Parameter(Member): return " ESX_VI__METHOD__PARAMETER__SERIALIZE(%s, %s)\n" \ % (self.type, self.name) - def get_type_string(self, as_return_value=False): string = "" @@ -173,7 +159,6 @@ class Parameter(Member): return string - def get_occurrence_short_enum(self): if self.occurrence == OCCURRENCE__REQUIRED_ITEM: return "RequiredItem" @@ -187,7 +172,6 @@ class Parameter(Member): raise ValueError("unknown occurrence value '%s'" % self.occurrence) - class Method: def __init__(self, name, parameters, returns): self.name = name @@ -201,7 +185,6 @@ class Method: else: self.autobind_parameter = parameter - def generate_header(self): header = "int esxVI_%s\n" % self.name header += " (esxVI_Context *ctx" @@ -224,7 +207,6 @@ class Method: return header - def generate_source(self): source = "/* esxVI_%s */\n" % self.name source += "ESX_VI__METHOD(%s," % self.name @@ -288,14 +270,12 @@ class Method: return source - class Property(Member): def __init__(self, type, name, occurrence): Member.__init__(self, type, occurrence) self.name = name - def generate_struct_member(self): if self.occurrence == OCCURRENCE__IGNORED: return " /* FIXME: %s is currently ignored */\n" % self.name @@ -304,7 +284,6 @@ class Property(Member): return aligned(string, self.get_occurrence_comment() + "\n") - def generate_free_code(self): if self.type == "String" and \ self.occurrence not in [OCCURRENCE__REQUIRED_LIST, @@ -319,7 +298,6 @@ class Property(Member): else: return " esxVI_%s_Free(&item->%s);\n" % (self.type, self.name) - def generate_validate_code(self, managed=False): if managed: macro = "ESX_VI__TEMPLATE__PROPERTY__MANAGED_REQUIRE" @@ -334,7 +312,6 @@ class Property(Member): else: return "" - def generate_deep_copy_code(self): if self.occurrence == OCCURRENCE__IGNORED: return " /* FIXME: %s is currently ignored */\n" % self.name @@ -351,7 +328,6 @@ class Property(Member): return " ESX_VI__TEMPLATE__PROPERTY__DEEP_COPY(%s, %s)\n" \ % (self.type, self.name) - def generate_serialize_code(self): if self.occurrence == OCCURRENCE__IGNORED: return " /* FIXME: %s is currently ignored */\n" % self.name @@ -366,7 +342,6 @@ class Property(Member): return " ESX_VI__TEMPLATE__PROPERTY__SERIALIZE(%s, %s)\n" \ % (self.type, self.name) - def generate_deserialize_code(self): if self.occurrence == OCCURRENCE__IGNORED: return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_IGNORE(%s) /* FIXME */\n" \ @@ -382,7 +357,6 @@ class Property(Member): return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE(%s, %s)\n" \ % (self.type, self.name) - def generate_lookup_code(self): if self.occurrence == OCCURRENCE__IGNORED: return " ESX_VI__TEMPLATE__PROPERTY__CAST_FROM_ANY_TYPE_IGNORE(%s) /* FIXME */\n" \ @@ -398,7 +372,6 @@ class Property(Member): return " ESX_VI__TEMPLATE__PROPERTY__CAST_FROM_ANY_TYPE(%s, %s)\n" \ % (self.type, self.name) - def get_type_string(self): if self.type == "String" and \ self.occurrence not in [OCCURRENCE__REQUIRED_LIST, @@ -410,29 +383,24 @@ class Property(Member): return "esxVI_%s *" % self.type - class Type: def __init__(self, kind, name): self.kind = kind self.name = name - def generate_typedef(self): return "typedef %s _esxVI_%s esxVI_%s;\n" \ % (self.kind, self.name, self.name) - def generate_typeenum(self): return " esxVI_Type_%s,\n" % self.name - def generate_typetostring(self): string = " case esxVI_Type_%s:\n" % self.name string += " return \"%s\";\n\n" % self.name return string - def generate_typefromstring(self): string = " if (STREQ(type, \"%s\"))\n" % self.name string += " return esxVI_Type_%s;\n" % self.name @@ -448,14 +416,12 @@ class GenericObject(Type): FEATURE__SERIALIZE = (1 << 5) FEATURE__DESERIALIZE = (1 << 6) - def __init__(self, name, category, managed, generic_objects_by_name): Type.__init__(self, "struct", name) self.category = category self.managed = managed self.generic_objects_by_name = generic_objects_by_name - def generate_comment(self): comment = separator comment += " * %s: %s\n" % (self.category, self.name) @@ -480,7 +446,6 @@ class GenericObject(Type): return comment - def generate_struct_members(self, add_banner=False, struct_gap=False): members = "" @@ -503,7 +468,6 @@ class GenericObject(Type): return members - def generate_dispatch(self, suffix, is_first=True): source = "" @@ -523,7 +487,6 @@ class GenericObject(Type): return source - def generate_free_code(self, add_banner=False): source = "" @@ -549,7 +512,6 @@ class GenericObject(Type): return source - def generate_validate_code(self, add_banner=False): source = "" @@ -576,7 +538,6 @@ class GenericObject(Type): return source - class Object(GenericObject): def __init__(self, name, extends, properties, features=0, extended_by=None): GenericObject.__init__(self, name, 'VI Object', False, objects_by_name) @@ -589,7 +550,6 @@ class Object(GenericObject): if self.extended_by is not None: self.extended_by.sort() - def generate_dynamic_cast_code(self, is_first=True): source = "" @@ -609,7 +569,6 @@ class Object(GenericObject): return source - def generate_deep_copy_code(self, add_banner=False): source = "" @@ -635,7 +594,6 @@ class Object(GenericObject): return source - def generate_serialize_code(self, add_banner=False): source = "" @@ -654,7 +612,6 @@ class Object(GenericObject): return source - def generate_deserialize_code(self, add_banner=False): source = "" @@ -673,7 +630,6 @@ class Object(GenericObject): return source - def generate_header(self): header = self.generate_comment() @@ -754,7 +710,6 @@ class Object(GenericObject): return header - def generate_source(self): source = separator source += " * VI Object: %s\n" % self.name @@ -916,7 +871,6 @@ class Object(GenericObject): return source - class ManagedObject(GenericObject): def __init__(self, name, extends, properties, features=0, extended_by=None): GenericObject.__init__(self, name, 'VI Managed Object', True, @@ -929,7 +883,6 @@ class ManagedObject(GenericObject): if self.extended_by is not None: self.extended_by.sort() - def generate_lookup_code1(self, add_banner=False): source = "" @@ -955,7 +908,6 @@ class ManagedObject(GenericObject): return source - def generate_lookup_code2(self, add_banner=False): source = "" @@ -981,7 +933,6 @@ class ManagedObject(GenericObject): return source - def generate_header(self): header = self.generate_comment() @@ -1017,7 +968,6 @@ class ManagedObject(GenericObject): return header - def generate_helper_header(self): # functions return ( @@ -1030,7 +980,6 @@ class ManagedObject(GenericObject): % {"name": self.name} ) - def generate_source(self): source = self.generate_comment() @@ -1084,7 +1033,6 @@ class ManagedObject(GenericObject): return source - def generate_helper_source(self): # lookup return ( @@ -1106,13 +1054,11 @@ class Enum(Type): FEATURE__SERIALIZE = (1 << 2) FEATURE__DESERIALIZE = (1 << 3) - def __init__(self, name, values, features=0): Type.__init__(self, "enum", name) self.values = values self.features = features - def generate_header(self): header = separator header += " * VI Enum: %s\n" % self.name @@ -1145,7 +1091,6 @@ class Enum(Type): return header - def generate_source(self): source = separator source += " * VI Enum: %s\n" % self.name @@ -1183,18 +1128,15 @@ class Enum(Type): return source - def report_error(message): print("error: " + message) sys.exit(1) - def capitalize_first(string): return string[:1].upper() + string[1:] - def parse_object(block): # expected format: [managed] object <name> [extends <name>] header_items = block[0][1].split() @@ -1239,7 +1181,6 @@ def parse_object(block): return Object(name=name, extends=extends, properties=properties) - def parse_enum(block): # expected format: enum <name> header_items = block[0][1].split() @@ -1260,7 +1201,6 @@ def parse_enum(block): return Enum(name=name, values=values) - def parse_method(block): # expected format: method <name> [returns <type> <occurrence>] header_items = block[0][1].split() @@ -1298,7 +1238,6 @@ def parse_method(block): return Method(name=name, parameters=parameters, returns=returns) - def is_known_type(type): return type in predefined_objects or \ type in predefined_enums or \ @@ -1307,7 +1246,6 @@ def is_known_type(type): type in enums_by_name - def open_and_print(filename): if filename.startswith("./"): print(" GEN " + filename[2:]) @@ -1317,7 +1255,6 @@ def open_and_print(filename): return open(filename, "wt") - predefined_enums = ["Boolean"] predefined_objects = ["AnyType", @@ -1380,7 +1317,6 @@ additional_object_features = { removed_object_features = {} - if "srcdir" in os.environ: input_filename = os.path.join(os.environ["srcdir"], "esx/esx_vi_generator.input") output_dirname = os.path.join(os.environ["srcdir"], "esx") @@ -1389,7 +1325,6 @@ else: output_dirname = os.getcwd() - types_typedef = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typedef")) types_typeenum = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typeenum")) types_typetostring = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typetostring")) @@ -1403,7 +1338,6 @@ helpers_header = open_and_print(os.path.join(output_dirname, "esx_vi.generated.h helpers_source = open_and_print(os.path.join(output_dirname, "esx_vi.generated.c")) - number = 0 objects_by_name = {} managed_objects_by_name = {} @@ -1412,7 +1346,6 @@ methods_by_name = {} block = None - # parse input file for line in open(input_filename, "rt").readlines(): number += 1 @@ -1452,7 +1385,6 @@ for line in open(input_filename, "rt").readlines(): block.append((number, line)) - for method in methods_by_name.values(): # method parameter types must be serializable for parameter in method.parameters: @@ -1492,7 +1424,6 @@ for method in methods_by_name.values(): objects_by_name[method.returns.type].features |= Object.FEATURE__LIST - for enum in enums_by_name.values(): # apply additional features if enum.name in additional_enum_features: @@ -1502,7 +1433,6 @@ for enum in enums_by_name.values(): enum.features |= Enum.FEATURE__DESERIALIZE - for obj in objects_by_name.values(): for property in obj.properties: if property.occurrence != OCCURRENCE__IGNORED and \ @@ -1554,7 +1484,6 @@ for obj in objects_by_name.values(): extended_obj.extended_by.sort() - for obj in objects_by_name.values(): # if an object is a candidate (it is used directly as parameter or return # type or is a member of another object) and it is extended by another @@ -1563,7 +1492,6 @@ for obj in objects_by_name.values(): obj.features |= Object.FEATURE__DYNAMIC_CAST - def propagate_feature(obj, feature): global features_have_changed @@ -1593,7 +1521,6 @@ def propagate_feature(obj, feature): propagate_feature(objects_by_name[property.type], feature) - def inherit_features(obj): global features_have_changed @@ -1617,7 +1544,6 @@ def inherit_features(obj): inherit_features(objects_by_name[extended_by]) - # there are two directions to spread features: # 1) up and down the inheritance chain # 2) from object types to their member property types @@ -1637,7 +1563,6 @@ while features_have_changed: inherit_features(obj) - for obj in managed_objects_by_name.values(): for property in obj.properties: if property.occurrence != OCCURRENCE__IGNORED and \ @@ -1661,7 +1586,6 @@ for obj in managed_objects_by_name.values(): extended_obj.extended_by.sort() - notice = "/* Generated by esx_vi_generator.py */\n\n\n\n" types_typedef.write(notice) @@ -1677,7 +1601,6 @@ helpers_header.write(notice) helpers_source.write(notice) - # output enums types_typedef.write(separator + " * VI Enums\n" + @@ -1694,7 +1617,6 @@ for name in names: types_source.write(enums_by_name[name].generate_source()) - # output objects types_typedef.write("\n\n\n" + separator + @@ -1715,7 +1637,6 @@ for name in names: types_source.write(objects_by_name[name].generate_source()) - # output managed objects types_typedef.write("\n\n\n" + separator + @@ -1736,7 +1657,6 @@ for name in names: types_source.write(managed_objects_by_name[name].generate_source()) - # output methods names = sorted(methods_by_name.keys()) @@ -1755,7 +1675,6 @@ for name in names: methods_macro.write(string) - # output helpers names = sorted(managed_objects_by_name.keys()) diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index 4f486913bd..64a198a12c 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -30,6 +30,7 @@ separator = "/*" + ("*" * 50) + "*\n" wmi_version_separator = "/" wmi_classes_by_name = {} + class WmiClass: """Represents WMI class and provides methods to generate C code. @@ -49,7 +50,6 @@ class WmiClass: self.versions = versions if versions else list() self.common = None - def prepare(self): """Prepares the class for code generation @@ -73,7 +73,6 @@ class WmiClass: # are in the same order - to ensure C struct member alignment self._align_property_members() - def generate_classes_header(self): """Generate C header code and return it as string @@ -102,7 +101,6 @@ class WmiClass: return header - def generate_classes_source(self): """Returns a C code string defining wsman data structs @@ -132,13 +130,11 @@ class WmiClass: source += ' { "", "", 0 },\n' # null terminated source += '};\n\n' - source += self._define_WmiInfo_struct() source += "\n\n" return source - def generate_classes_typedef(self): """Returns C string for typdefs""" @@ -152,8 +148,6 @@ class WmiClass: return typedef - - def _declare_data_structs(self): """Returns string C code declaring data structs. @@ -184,7 +178,6 @@ class WmiClass: return header - def _declare_hypervObject_struct(self): """Return string for C code declaring hypervObject instance""" @@ -211,7 +204,6 @@ class WmiClass: return header - def _define_WmiInfo_struct(self): """Return string for C code defining *_WmiInfo struct @@ -241,7 +233,6 @@ class WmiClass: return source - def _align_property_members(self): """Identifies common properties in all class versions. @@ -308,7 +299,6 @@ class WmiClass: self.common.append(x[0]) - class ClassUriInfo: """Prepares URI information needed for wsman requests.""" @@ -328,7 +318,6 @@ class ClassUriInfo: self.resourceUri = "%s/%s" % (baseUri, wmi_name) - class WmiClassVersion: """Represents specific version of WMI class.""" @@ -339,7 +328,6 @@ class WmiClassVersion: self.uri_info = uri_info - class Property: typemap = { "boolean": "BOOL", @@ -359,7 +347,6 @@ class Property: "uint64": "UINT64" } - def __init__(self, type, name, is_array): if type not in Property.typemap: report_error("unhandled property type %s" % type) @@ -368,7 +355,6 @@ class Property: self.name = name self.is_array = is_array - def generate_classes_header(self): if self.is_array: return " XML_TYPE_DYN_ARRAY %s;\n" % self.name @@ -376,7 +362,6 @@ class Property: return " XML_TYPE_%s %s;\n" \ % (Property.typemap[self.type], self.name) - def generate_classes_source(self, class_name): if self.is_array: return " SER_NS_DYN_ARRAY(%s_RESOURCE_URI, \"%s\", 0, 0, %s),\n" \ @@ -385,12 +370,10 @@ class Property: return " SER_NS_%s(%s_RESOURCE_URI, \"%s\", 1),\n" \ % (Property.typemap[self.type], class_name.upper(), self.name) - def generate_typemap(self): return ' { "%s", "%s", %s },\n' % (self.name, self.type.lower(), str(self.is_array).lower()) - def open_and_print(filename): if filename.startswith("./"): print(" GEN " + filename[2:]) @@ -400,13 +383,11 @@ def open_and_print(filename): return open(filename, "wt") - def report_error(message): print("error: " + message) sys.exit(1) - def parse_class(block, number): # expected format: class <name> header_items = block[0][1].split() @@ -452,7 +433,6 @@ def parse_class(block, number): wmi_classes_by_name[wmi_name] = WmiClass(wmi_name, [cls]) - def main(): if "srcdir" in os.environ: input_filename = os.path.join(os.environ["srcdir"], "hyperv/hyperv_wmi_generator.input") @@ -513,6 +493,5 @@ def main(): classes_source.write(cls.generate_classes_source()) - if __name__ == "__main__": main() diff --git a/tests/cputestdata/cpu-cpuid.py b/tests/cputestdata/cpu-cpuid.py index ae3cf5996a..40b6c19c23 100755 --- a/tests/cputestdata/cpu-cpuid.py +++ b/tests/cputestdata/cpu-cpuid.py @@ -5,6 +5,7 @@ import sys import json import xmltodict + def checkCPUIDFeature(cpuData, feature): eax_in = feature["eax_in"] ecx_in = feature["ecx_in"] -- 2.21.0

Line continuations should be 4 space indented unless a previous opening brace required different alignment. docs/apibuild.py:2014:24: E126 continuation line over-indented for hanging indent token[0], token[1])) ^ docs/apibuild.py:74:3: E121 continuation line under-indented for hanging indent "ATTRIBUTE_UNUSED": (0, "macro keyword"), ^ ...more... Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- build-aux/syntax-check.mk | 4 +- docs/apibuild.py | 242 ++++++++++++++++++------------------ src/esx/esx_vi_generator.py | 144 +++++++++++---------- 3 files changed, 200 insertions(+), 190 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 1dcf9f169c..ebacb8312e 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -879,12 +879,10 @@ sc_require_enum_last_marker: exit 1; } || : # Validate many python style rules -FLAKE8_INDENTATION = E114,E115,E116,E121,E125,E126,E127,E128,E129,E131 FLAKE8_LINE_LENGTH = E501 FLAKE8_WARNINGS = W504 -FLAKE8_IGNORE = $(FLAKE8_INDENTATION),$\ - $(FLAKE8_LINE_LENGTH),$\ +FLAKE8_IGNORE = $(FLAKE8_LINE_LENGTH),$\ $(FLAKE8_WARNINGS) \ $(NULL) diff --git a/docs/apibuild.py b/docs/apibuild.py index bdf217f52c..5fe2c2dc77 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -24,103 +24,103 @@ debugsym = None # C parser analysis code # included_files = { - "libvirt-common.h": "header with general libvirt API definitions", - "libvirt-domain.h": "header with general libvirt API definitions", - "libvirt-domain-checkpoint.h": "header with general libvirt API definitions", - "libvirt-domain-snapshot.h": "header with general libvirt API definitions", - "libvirt-event.h": "header with general libvirt API definitions", - "libvirt-host.h": "header with general libvirt API definitions", - "libvirt-interface.h": "header with general libvirt API definitions", - "libvirt-network.h": "header with general libvirt API definitions", - "libvirt-nodedev.h": "header with general libvirt API definitions", - "libvirt-nwfilter.h": "header with general libvirt API definitions", - "libvirt-secret.h": "header with general libvirt API definitions", - "libvirt-storage.h": "header with general libvirt API definitions", - "libvirt-stream.h": "header with general libvirt API definitions", - "virterror.h": "header with error specific API definitions", - "libvirt.c": "Main interfaces for the libvirt library", - "libvirt-domain.c": "Domain interfaces for the libvirt library", - "libvirt-domain-checkpoint.c": "Domain checkpoint interfaces for the libvirt library", - "libvirt-domain-snapshot.c": "Domain snapshot interfaces for the libvirt library", - "libvirt-host.c": "Host interfaces for the libvirt library", - "libvirt-interface.c": "Interface interfaces for the libvirt library", - "libvirt-network.c": "Network interfaces for the libvirt library", - "libvirt-nodedev.c": "Node device interfaces for the libvirt library", - "libvirt-nwfilter.c": "NWFilter interfaces for the libvirt library", - "libvirt-secret.c": "Secret interfaces for the libvirt library", - "libvirt-storage.c": "Storage interfaces for the libvirt library", - "libvirt-stream.c": "Stream interfaces for the libvirt library", - "virerror.c": "implements error handling and reporting code for libvirt", - "virevent.c": "event loop for monitoring file handles", - "virtypedparam-public.c": "virTypedParameters APIs", + "libvirt-common.h": "header with general libvirt API definitions", + "libvirt-domain.h": "header with general libvirt API definitions", + "libvirt-domain-checkpoint.h": "header with general libvirt API definitions", + "libvirt-domain-snapshot.h": "header with general libvirt API definitions", + "libvirt-event.h": "header with general libvirt API definitions", + "libvirt-host.h": "header with general libvirt API definitions", + "libvirt-interface.h": "header with general libvirt API definitions", + "libvirt-network.h": "header with general libvirt API definitions", + "libvirt-nodedev.h": "header with general libvirt API definitions", + "libvirt-nwfilter.h": "header with general libvirt API definitions", + "libvirt-secret.h": "header with general libvirt API definitions", + "libvirt-storage.h": "header with general libvirt API definitions", + "libvirt-stream.h": "header with general libvirt API definitions", + "virterror.h": "header with error specific API definitions", + "libvirt.c": "Main interfaces for the libvirt library", + "libvirt-domain.c": "Domain interfaces for the libvirt library", + "libvirt-domain-checkpoint.c": "Domain checkpoint interfaces for the libvirt library", + "libvirt-domain-snapshot.c": "Domain snapshot interfaces for the libvirt library", + "libvirt-host.c": "Host interfaces for the libvirt library", + "libvirt-interface.c": "Interface interfaces for the libvirt library", + "libvirt-network.c": "Network interfaces for the libvirt library", + "libvirt-nodedev.c": "Node device interfaces for the libvirt library", + "libvirt-nwfilter.c": "NWFilter interfaces for the libvirt library", + "libvirt-secret.c": "Secret interfaces for the libvirt library", + "libvirt-storage.c": "Storage interfaces for the libvirt library", + "libvirt-stream.c": "Stream interfaces for the libvirt library", + "virerror.c": "implements error handling and reporting code for libvirt", + "virevent.c": "event loop for monitoring file handles", + "virtypedparam-public.c": "virTypedParameters APIs", } qemu_included_files = { - "libvirt-qemu.h": "header with QEMU specific API definitions", - "libvirt-qemu.c": "Implementations for the QEMU specific APIs", + "libvirt-qemu.h": "header with QEMU specific API definitions", + "libvirt-qemu.c": "Implementations for the QEMU specific APIs", } lxc_included_files = { - "libvirt-lxc.h": "header with LXC specific API definitions", - "libvirt-lxc.c": "Implementations for the LXC specific APIs", + "libvirt-lxc.h": "header with LXC specific API definitions", + "libvirt-lxc.c": "Implementations for the LXC specific APIs", } admin_included_files = { - "libvirt-admin.h": "header with admin specific API definitions", - "libvirt-admin.c": "Implementations for the admin specific APIs", + "libvirt-admin.h": "header with admin specific API definitions", + "libvirt-admin.c": "Implementations for the admin specific APIs", } ignored_words = { - "ATTRIBUTE_UNUSED": (0, "macro keyword"), - "ATTRIBUTE_SENTINEL": (0, "macro keyword"), - "VIR_DEPRECATED": (0, "macro keyword"), - "VIR_EXPORT_VAR": (0, "macro keyword"), - "WINAPI": (0, "Windows keyword"), - "__declspec": (3, "Windows keyword"), - "__stdcall": (0, "Windows keyword"), + "ATTRIBUTE_UNUSED": (0, "macro keyword"), + "ATTRIBUTE_SENTINEL": (0, "macro keyword"), + "VIR_DEPRECATED": (0, "macro keyword"), + "VIR_EXPORT_VAR": (0, "macro keyword"), + "WINAPI": (0, "Windows keyword"), + "__declspec": (3, "Windows keyword"), + "__stdcall": (0, "Windows keyword"), } ignored_functions = { - "virConnectSupportsFeature": "private function for remote access", - "virDomainMigrateFinish": "private function for migration", - "virDomainMigrateFinish2": "private function for migration", - "virDomainMigratePerform": "private function for migration", - "virDomainMigratePrepare": "private function for migration", - "virDomainMigratePrepare2": "private function for migration", - "virDomainMigratePrepareTunnel": "private function for tunnelled migration", - "virDomainMigrateBegin3": "private function for migration", - "virDomainMigrateFinish3": "private function for migration", - "virDomainMigratePerform3": "private function for migration", - "virDomainMigratePrepare3": "private function for migration", - "virDomainMigrateConfirm3": "private function for migration", - "virDomainMigratePrepareTunnel3": "private function for tunnelled migration", - "DllMain": "specific function for Win32", - "virTypedParamsValidate": "internal function in virtypedparam.c", - "virTypedParameterValidateSet": "internal function in virtypedparam.c", - "virTypedParameterAssign": "internal function in virtypedparam.c", - "virTypedParameterAssignFromStr": "internal function in virtypedparam.c", - "virTypedParameterToString": "internal function in virtypedparam.c", - "virTypedParamsCheck": "internal function in virtypedparam.c", - "virTypedParamsCopy": "internal function in virtypedparam.c", - "virDomainMigrateBegin3Params": "private function for migration", - "virDomainMigrateFinish3Params": "private function for migration", - "virDomainMigratePerform3Params": "private function for migration", - "virDomainMigratePrepare3Params": "private function for migration", - "virDomainMigrateConfirm3Params": "private function for migration", - "virDomainMigratePrepareTunnel3Params": "private function for tunnelled migration", - "virErrorCopyNew": "private", + "virConnectSupportsFeature": "private function for remote access", + "virDomainMigrateFinish": "private function for migration", + "virDomainMigrateFinish2": "private function for migration", + "virDomainMigratePerform": "private function for migration", + "virDomainMigratePrepare": "private function for migration", + "virDomainMigratePrepare2": "private function for migration", + "virDomainMigratePrepareTunnel": "private function for tunnelled migration", + "virDomainMigrateBegin3": "private function for migration", + "virDomainMigrateFinish3": "private function for migration", + "virDomainMigratePerform3": "private function for migration", + "virDomainMigratePrepare3": "private function for migration", + "virDomainMigrateConfirm3": "private function for migration", + "virDomainMigratePrepareTunnel3": "private function for tunnelled migration", + "DllMain": "specific function for Win32", + "virTypedParamsValidate": "internal function in virtypedparam.c", + "virTypedParameterValidateSet": "internal function in virtypedparam.c", + "virTypedParameterAssign": "internal function in virtypedparam.c", + "virTypedParameterAssignFromStr": "internal function in virtypedparam.c", + "virTypedParameterToString": "internal function in virtypedparam.c", + "virTypedParamsCheck": "internal function in virtypedparam.c", + "virTypedParamsCopy": "internal function in virtypedparam.c", + "virDomainMigrateBegin3Params": "private function for migration", + "virDomainMigrateFinish3Params": "private function for migration", + "virDomainMigratePerform3Params": "private function for migration", + "virDomainMigratePrepare3Params": "private function for migration", + "virDomainMigrateConfirm3Params": "private function for migration", + "virDomainMigratePrepareTunnel3Params": "private function for tunnelled migration", + "virErrorCopyNew": "private", } ignored_macros = { - "_virSchedParameter": "backward compatibility macro for virTypedParameter", - "_virBlkioParameter": "backward compatibility macro for virTypedParameter", - "_virMemoryParameter": "backward compatibility macro for virTypedParameter", + "_virSchedParameter": "backward compatibility macro for virTypedParameter", + "_virBlkioParameter": "backward compatibility macro for virTypedParameter", + "_virMemoryParameter": "backward compatibility macro for virTypedParameter", } # macros that should be completely skipped hidden_macros = { - "VIR_DEPRECATED": "internal macro to mark deprecated apis", - "VIR_EXPORT_VAR": "internal macro to mark exported vars", + "VIR_DEPRECATED": "internal macro to mark deprecated apis", + "VIR_EXPORT_VAR": "internal macro to mark exported vars", } @@ -909,8 +909,8 @@ class CParser: i = i + 1 if i >= nbargs: if not quiet: - self.warning("Unable to find arg %s from function comment for %s" % ( - arg, name)) + self.warning("Unable to find arg %s from function comment for %s" % + (arg, name)) while len(lines) > 0 and lines[0] == '*': del lines[0] desc = None @@ -977,7 +977,7 @@ class CParser: return None if token[0] == 'preproc': self.index_add(token[1], self.filename, not self.is_header, - "include") + "include") return self.lexer.token() return token if name == "#define": @@ -989,8 +989,8 @@ class CParser: name = token[1] lst = [] token = self.lexer.token() - while token is not None and token[0] == 'preproc' and \ - token[1][0] != '#': + while (token is not None and token[0] == 'preproc' and + token[1][0] != '#'): lst.append(token[1]) token = self.lexer.token() try: @@ -1058,17 +1058,17 @@ class CParser: except Exception: pass elif name == "#else": - if self.conditionals != [] and \ - self.defines[-1].find('ENABLED') != -1: + if (self.conditionals != [] and + self.defines[-1].find('ENABLED') != -1): self.conditionals[-1] = "!(%s)" % self.conditionals[-1] elif name == "#endif": - if self.conditionals != [] and \ - self.defines[-1].find('ENABLED') != -1: + if (self.conditionals != [] and + self.defines[-1].find('ENABLED') != -1): self.conditionals = self.conditionals[:-1] self.defines = self.defines[:-1] token = self.lexer.token() - while token is not None and token[0] == 'preproc' and \ - token[1][0] != '#': + while (token is not None and token[0] == 'preproc' and + token[1][0] != '#'): token = self.lexer.token() return token @@ -1133,19 +1133,19 @@ class CParser: if signature is not None: type = type.split('(')[0] d = self.mergeFunctionComment(name, - ((type, None), signature), 1) + ((type, None), signature), 1) self.index_add(name, self.filename, not self.is_header, - "functype", d) + "functype", d) else: if base_type == "struct": self.index_add(name, self.filename, not self.is_header, - "struct", type) + "struct", type) base_type = "struct " + name else: # TODO report missing or misformatted comments info = self.parseTypeComment(name, 1) self.index_add(name, self.filename, not self.is_header, - "typedef", type, info) + "typedef", type, info) token = self.token() else: self.error("parsing typedef: expecting a name") @@ -1188,20 +1188,20 @@ class CParser: if oldtok[0] == "name" and oldtok[1][0:3] == "vir": if token[0] == "sep" and token[1] == "(": self.index_add_ref(oldtok[1], self.filename, - 0, "function") + 0, "function") token = self.token() elif token[0] == "name": token = self.token() if token[0] == "sep" and (token[1] == ";" or token[1] == "," or token[1] == "="): self.index_add_ref(oldtok[1], self.filename, - 0, "type") + 0, "type") elif oldtok[0] == "name" and oldtok[1][0:4] == "XEN_": self.index_add_ref(oldtok[1], self.filename, - 0, "typedef") + 0, "typedef") elif oldtok[0] == "name" and oldtok[1][0:7] == "LIBXEN_": self.index_add_ref(oldtok[1], self.filename, - 0, "typedef") + 0, "typedef") else: token = self.token() @@ -1350,7 +1350,7 @@ class CParser: value = token[1][1:] token = self.token() while token[0] != "sep" or (token[1] != ',' and - token[1] != '}'): + token[1] != '}'): # We might be dealing with '1U << 12' here value = value + re.sub(r"^(\d+)U$", "\\1", token[1]) token = self.token() @@ -1670,7 +1670,8 @@ class CParser: return token token = self.token() while token is not None and (token[0] == "op" or - token[0] == "name" and token[1] == "const"): + token[0] == "name" and + token[1] == "const"): self.type = self.type + " " + token[1] token = self.token() @@ -1718,8 +1719,8 @@ class CParser: while token is not None and token[0] == "sep" and token[1] == '[': self.type = self.type + token[1] token = self.token() - while token is not None and token[0] != 'sep' and \ - token[1] != ']' and token[1] != ';': + while (token is not None and token[0] != 'sep' and + token[1] != ']' and token[1] != ';'): self.type = self.type + token[1] token = self.token() if token is not None and token[0] == 'sep' and token[1] == ']': @@ -1868,13 +1869,13 @@ class CParser: token = self.token() # print('Entering extern "C line ', self.lineno()) while token is not None and (token[0] != 'sep' or - token[1] != "}"): + token[1] != "}"): if token[0] == 'name': token = self.parseGlobal(token) else: - self.error( - "token %s %s unexpected at the top level" % ( - token[0], token[1])) + self.error(("token %s %s unexpected at the " + "top level") % + (token[0], token[1])) token = self.parseGlobal(token) # print('Exiting extern "C" line', self.lineno()) token = self.token() @@ -1933,10 +1934,11 @@ class CParser: if type == "struct": self.checkLongLegacyStruct(self.name, self.struct_fields) self.index_add(self.name, self.filename, - not self.is_header, "struct", self.struct_fields) + not self.is_header, "struct", + self.struct_fields) else: self.index_add(self.name, self.filename, - not self.is_header, "variable", type) + not self.is_header, "variable", type) break elif token[1] == "(": token = self.token() @@ -1946,22 +1948,24 @@ class CParser: if token[0] == "sep" and token[1] == ";": self.checkLongLegacyFunction(self.name, type, self.signature) d = self.mergeFunctionComment(self.name, - ((type, None), self.signature), 1) + ((type, None), + self.signature), 1) self.index_add(self.name, self.filename, static, - "function", d) + "function", d) token = self.token() elif token[0] == "sep" and token[1] == "{": self.checkLongLegacyFunction(self.name, type, self.signature) d = self.mergeFunctionComment(self.name, - ((type, None), self.signature), static) + ((type, None), + self.signature), static) self.index_add(self.name, self.filename, static, - "function", d) + "function", d) token = self.token() token = self.parseBlock(token) elif token[1] == ',': self.comment = None self.index_add(self.name, self.filename, static, - "variable", type) + "variable", type) type = type_orig token = self.token() while token is not None and token[0] == "sep": @@ -1984,7 +1988,7 @@ class CParser: token = self.parseGlobal(token) else: self.error("token %s %s unexpected at the top level" % ( - token[0], token[1])) + token[0], token[1])) token = self.parseGlobal(token) return self.parseTopComment(self.top_comment) @@ -2182,7 +2186,7 @@ class docBuilder: id = self.idx.typedefs[name] if id.info[0:7] == 'struct ': output.write(" <struct name='%s' file='%s' type='%s'" % ( - name, self.modulename_file(id.header), id.info)) + name, self.modulename_file(id.header), id.info)) name = id.info[7:] if (name in self.idx.structs and isinstance(self.idx.structs[name].info, (list, tuple))): @@ -2221,10 +2225,10 @@ class docBuilder: id = self.idx.variables[name] if id.info is not None: output.write(" <variable name='%s' file='%s' type='%s'/>\n" % ( - name, self.modulename_file(id.header), id.info)) + name, self.modulename_file(id.header), id.info)) else: output.write(" <variable name='%s' file='%s'/>\n" % ( - name, self.modulename_file(id.header))) + name, self.modulename_file(id.header))) def serialize_function(self, output, name): id = self.idx.functions[name] @@ -2256,7 +2260,7 @@ class docBuilder: self.error("Missing documentation for return of function `%s'" % name) else: output.write(" <return type='%s' info='%s'/>\n" % ( - ret[0], escape(ret[1]))) + ret[0], escape(ret[1]))) self.indexString(name, ret[1]) for param in params: if param[0] == 'void': @@ -2407,10 +2411,10 @@ class docBuilder: for id in typ: idf = self.idx.identifiers[id] module = idf.header - output.write(" <reference name='%s' href='%s'/>\n" % (id, - 'html/' + self.basename + '-' + - self.modulename_file(module) + '.html#' + - id)) + output.write(" <reference name='%s' href='%s'/>\n" % + (id, 'html/' + self.basename + '-' + + self.modulename_file(module) + '.html#' + + id)) def serialize_xrefs_index(self, output): index = self.xref @@ -2548,7 +2552,7 @@ class app: srcdir + "/../src/util", srcdir + "/../include/libvirt"] if (builddir and - not os.path.exists(srcdir + "/../include/libvirt/libvirt-common.h")): + not os.path.exists(srcdir + "/../include/libvirt/libvirt-common.h")): dirs.append(builddir + "/../include/libvirt") builder = docBuilder(name, srcdir, dirs, []) elif glob.glob("src/libvirt.c") != []: diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index d6e5e1c7cd..3242513b71 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -453,9 +453,9 @@ class GenericObject(Type): members += "\n" if self.extends is not None: - members += self.generic_objects_by_name[self.extends] \ - .generate_struct_members(add_banner=True, - struct_gap=False) + "\n" + obj = self.generic_objects_by_name[self.extends] + members += obj.generate_struct_members(add_banner=True, + struct_gap=False) + "\n" if self.extends is not None or add_banner: members += " /* %s */\n" % self.name @@ -482,8 +482,8 @@ class GenericObject(Type): % (suffix, extended_by) for extended_by in self.extended_by: - source += self.generic_objects_by_name[extended_by] \ - .generate_dispatch(suffix, False) + obj = self.generic_objects_by_name[extended_by] + source += obj.generate_dispatch(suffix, False) return source @@ -491,8 +491,8 @@ class GenericObject(Type): source = "" if self.extends is not None: - source += self.generic_objects_by_name[self.extends] \ - .generate_free_code(add_banner=True) + "\n" + obj = self.generic_objects_by_name[self.extends] + source += obj.generate_free_code(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -516,8 +516,8 @@ class GenericObject(Type): source = "" if self.extends is not None: - source += self.generic_objects_by_name[self.extends] \ - .generate_validate_code(add_banner=True) + "\n" + obj = self.generic_objects_by_name[self.extends] + source += obj.generate_validate_code(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -564,8 +564,8 @@ class Object(GenericObject): % extended_by for extended_by in self.extended_by: - source += objects_by_name[extended_by] \ - .generate_dynamic_cast_code(False) + obj = objects_by_name[extended_by] + source += obj.generate_dynamic_cast_code(False) return source @@ -573,8 +573,8 @@ class Object(GenericObject): source = "" if self.extends is not None: - source += objects_by_name[self.extends] \ - .generate_deep_copy_code(add_banner=True) + "\n" + obj = objects_by_name[self.extends] + source += obj.generate_deep_copy_code(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -598,8 +598,8 @@ class Object(GenericObject): source = "" if self.extends is not None: - source += objects_by_name[self.extends] \ - .generate_serialize_code(add_banner=True) + "\n" + obj = objects_by_name[self.extends] + source += obj.generate_serialize_code(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -616,8 +616,8 @@ class Object(GenericObject): source = "" if self.extends is not None: - source += objects_by_name[self.extends] \ - .generate_deserialize_code(add_banner=True) + "\n" + obj = objects_by_name[self.extends] + source += obj.generate_deserialize_code(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -671,40 +671,46 @@ class Object(GenericObject): % (self.name, self.name, self.name) if self.features & Object.FEATURE__LIST: - header += ("int esxVI_%s_DeepCopyList(esxVI_%s **dstList, " - "esxVI_%s *srcList);\n") \ - % (self.name, self.name, self.name) + header += (( + "int esxVI_%s_DeepCopyList(esxVI_%s **dstList, " + " esxVI_%s *srcList);\n") % + (self.name, self.name, self.name)) if self.features & Object.FEATURE__ANY_TYPE: - header += ("int esxVI_%s_CastFromAnyType(esxVI_AnyType *anyType, " - "esxVI_%s **item);\n") \ - % (self.name, self.name) + header += (( + "int esxVI_%s_CastFromAnyType(esxVI_AnyType *anyType, " + " esxVI_%s **item);\n") % + (self.name, self.name)) if self.features & Object.FEATURE__LIST: - header += ("int esxVI_%s_CastListFromAnyType(esxVI_AnyType *anyType, " - "esxVI_%s **list);\n") \ - % (self.name, self.name) + header += (( + "int esxVI_%s_CastListFromAnyType(esxVI_AnyType *anyType, " + " esxVI_%s **list);\n") % + (self.name, self.name)) if self.features & Object.FEATURE__SERIALIZE: - header += ("int esxVI_%s_Serialize(esxVI_%s *item, " - "const char *element, " - "virBufferPtr output);\n") \ - % (self.name, self.name) + header += (( + "int esxVI_%s_Serialize(esxVI_%s *item, " + " const char *element, " + " virBufferPtr output);\n") % + (self.name, self.name)) if self.features & Object.FEATURE__LIST: - header += ("int esxVI_%s_SerializeList(esxVI_%s *list, " - "const char *element, " - "virBufferPtr output);\n") \ - % (self.name, self.name) + header += (( + "int esxVI_%s_SerializeList(esxVI_%s *list, " + " const char *element, " + " virBufferPtr output);\n") % + (self.name, self.name)) if self.features & Object.FEATURE__DESERIALIZE: header += "int esxVI_%s_Deserialize(xmlNodePtr node, esxVI_%s **item);\n" \ % (self.name, self.name) if self.features & Object.FEATURE__LIST: - header += ("int esxVI_%s_DeserializeList(xmlNodePtr node, " - "esxVI_%s **list);\n") \ - % (self.name, self.name) + header += (( + "int esxVI_%s_DeserializeList(xmlNodePtr node, " + " esxVI_%s **list);\n") % + (self.name, self.name)) header += "\n\n\n" @@ -887,8 +893,8 @@ class ManagedObject(GenericObject): source = "" if self.extends is not None: - source += managed_objects_by_name[self.extends] \ - .generate_lookup_code1(add_banner=True) + "\n" + obj = managed_objects_by_name[self.extends] + source += obj.generate_lookup_code1(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -912,8 +918,8 @@ class ManagedObject(GenericObject): source = "" if self.extends is not None: - source += managed_objects_by_name[self.extends] \ - .generate_lookup_code2(add_banner=True) + "\n" + obj = managed_objects_by_name[self.extends] + source += obj.generate_lookup_code2(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -957,12 +963,12 @@ class ManagedObject(GenericObject): header += "int esxVI_%s_Alloc(esxVI_%s **item);\n" % (self.name, self.name) header += "void esxVI_%s_Free(esxVI_%s **item);\n" % (self.name, self.name) header += ("int esxVI_%s_Validate(esxVI_%s *item, " - "esxVI_String *selectedPropertyNameList);\n") \ - % (self.name, self.name) + " esxVI_String *selectedPropertyNameList);\n") \ + % (self.name, self.name) if self.features & Object.FEATURE__LIST: header += "int esxVI_%s_AppendToList(esxVI_%s **list, esxVI_%s *item);\n" \ - % (self.name, self.name, self.name) + % (self.name, self.name, self.name) header += "\n\n\n" @@ -972,11 +978,11 @@ class ManagedObject(GenericObject): # functions return ( "int esxVI_Lookup%(name)s(esxVI_Context *ctx," - " const char *name," - " esxVI_ManagedObjectReference *root," - " esxVI_String *selectedPropertyNameList," - " esxVI_%(name)s **item," - " esxVI_Occurrence occurrence);\n\n" + " const char *name," + " esxVI_ManagedObjectReference *root," + " esxVI_String *selectedPropertyNameList," + " esxVI_%(name)s **item," + " esxVI_Occurrence occurrence);\n\n" % {"name": self.name} ) @@ -1074,18 +1080,18 @@ class Enum(Type): # functions if self.features & Enum.FEATURE__ANY_TYPE: header += ("int esxVI_%s_CastFromAnyType(esxVI_AnyType *anyType, " - "esxVI_%s *item);\n") \ - % (self.name, self.name) + " esxVI_%s *item);\n") \ + % (self.name, self.name) if self.features & Enum.FEATURE__SERIALIZE: header += ("int esxVI_%s_Serialize(esxVI_%s item, const char *element, " - "virBufferPtr output);\n") \ - % (self.name, self.name) + " virBufferPtr output);\n") \ + % (self.name, self.name) if self.features & Enum.FEATURE__DESERIALIZE: header += ("int esxVI_%s_Deserialize(xmlNodePtr node, " - "esxVI_%s *item);\n") \ - % (self.name, self.name) + " esxVI_%s *item);\n") \ + % (self.name, self.name) header += "\n\n\n" @@ -1096,12 +1102,12 @@ class Enum(Type): source += " * VI Enum: %s\n" % self.name source += " */\n\n" source += "static const esxVI_Enumeration _esxVI_%s_Enumeration = {\n" \ - % self.name + % self.name source += " esxVI_Type_%s, {\n" % self.name for value in self.values: source += " { \"%s\", esxVI_%s_%s },\n" \ - % (value, self.name, capitalize_first(value)) + % (value, self.name, capitalize_first(value)) source += " { NULL, -1 },\n" source += " },\n" @@ -1239,11 +1245,11 @@ def parse_method(block): def is_known_type(type): - return type in predefined_objects or \ - type in predefined_enums or \ - type in objects_by_name or \ - type in managed_objects_by_name or \ - type in enums_by_name + return (type in predefined_objects or + type in predefined_enums or + type in objects_by_name or + type in managed_objects_by_name or + type in enums_by_name) def open_and_print(filename): @@ -1499,17 +1505,19 @@ def propagate_feature(obj, feature): return for property in obj.properties: - if property.occurrence == OCCURRENCE__IGNORED or \ - not property.is_type_generated(): + if (property.occurrence == OCCURRENCE__IGNORED or + not property.is_type_generated()): continue if property.is_enum(): - if feature == Object.FEATURE__SERIALIZE and \ - not (enums_by_name[property.type].features & Enum.FEATURE__SERIALIZE): + if (feature == Object.FEATURE__SERIALIZE and + not (enums_by_name[property.type].features & + Enum.FEATURE__SERIALIZE)): enums_by_name[property.type].features |= Enum.FEATURE__SERIALIZE features_have_changed = True - elif feature == Object.FEATURE__DESERIALIZE and \ - not (enums_by_name[property.type].features & Enum.FEATURE__DESERIALIZE): + elif (feature == Object.FEATURE__DESERIALIZE and + not (enums_by_name[property.type].features & + Enum.FEATURE__DESERIALIZE)): enums_by_name[property.type].features |= Enum.FEATURE__DESERIALIZE features_have_changed = True elif property.is_object(): -- 2.21.0