mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 04:05:32 +00:00
Bug 1344840 - Enable flake8 rule E231: "missing whitespace after ','". r=dexter
This commit is contained in:
parent
d1b5ed8ea1
commit
187337cc20
@ -1,5 +1,5 @@
|
||||
[flake8]
|
||||
# See http://pep8.readthedocs.io/en/latest/intro.html#configuration
|
||||
ignore = E121, E123, E126, E129, E133, E226, E241, E242, E704, W503, E402, E502, E128, E501, E713, E231, E111, E261, E222, E201, E202, W602, E127, F841, W601
|
||||
ignore = E121, E123, E126, E129, E133, E226, E241, E242, E704, W503, E402, E502, E128, E501, E713, E111, E261, E222, E201, E202, W602, E127, F841, W601
|
||||
max-line-length = 99
|
||||
filename = *.py, +.lint
|
||||
|
@ -68,7 +68,7 @@ def write_common_event_table(events, output, string_table, extra_table):
|
||||
extra_count = 0
|
||||
|
||||
print("const CommonEventInfo %s[] = {" % table_name, file=output)
|
||||
for e,extras in zip(events, extra_table):
|
||||
for e, extras in zip(events, extra_table):
|
||||
# Write a comment to make the file human-readable.
|
||||
print(" // category: %s" % e.category, file=output)
|
||||
print(" // methods: [%s]" % ", ".join(e.methods), file=output)
|
||||
@ -94,7 +94,7 @@ def write_event_table(events, output, string_table):
|
||||
table_name = "gEventInfo"
|
||||
print("const EventInfo %s[] = {" % table_name, file=output)
|
||||
|
||||
for common_info_index,e in enumerate(events):
|
||||
for common_info_index, e in enumerate(events):
|
||||
for method_name, object_name in itertools.product(e.methods, e.objects):
|
||||
print(" // category: %s, method: %s, object: %s" %
|
||||
(e.category, method_name, object_name),
|
||||
|
@ -49,17 +49,17 @@ def main(output, *filenames):
|
||||
print(banner, file=output)
|
||||
print(file_header, file=output)
|
||||
|
||||
for category,indexed in grouped.iteritems():
|
||||
for category, indexed in grouped.iteritems():
|
||||
category_cpp = indexed[0][1].category_cpp
|
||||
|
||||
print("// category: %s" % category, file=output)
|
||||
print("enum class %s : uint32_t {" % category_cpp, file=output)
|
||||
|
||||
for event_index,e in indexed:
|
||||
for event_index, e in indexed:
|
||||
cpp_guard = e.cpp_guard
|
||||
if cpp_guard:
|
||||
print("#if defined(%s)" % cpp_guard, file=output)
|
||||
for offset,label in enumerate(e.enum_labels):
|
||||
for offset, label in enumerate(e.enum_labels):
|
||||
print(" %s = %d," % (label, event_index + offset), file=output)
|
||||
if cpp_guard:
|
||||
print("#endif", file=output)
|
||||
|
@ -63,7 +63,7 @@ def write_histogram_table(output, histograms):
|
||||
"index overflow")
|
||||
|
||||
print("\nconst uint32_t gHistogramLabelTable[] = {", file=output)
|
||||
for name,indexes in label_table:
|
||||
for name, indexes in label_table:
|
||||
print("/* %s */ %s," % (name, ", ".join(map(str, indexes))), file=output)
|
||||
print("};", file=output)
|
||||
|
||||
|
@ -88,17 +88,17 @@ def main(output, *filenames):
|
||||
# Write categorical label enums.
|
||||
categorical = filter(lambda h: h.kind() == "categorical", all_histograms)
|
||||
enums = [("LABELS_" + h.name(), h.labels(), h.name()) for h in categorical]
|
||||
for name,labels,_ in enums:
|
||||
for name, labels, _ in enums:
|
||||
print("\nenum class %s : uint32_t {" % name, file=output)
|
||||
print(" %s" % ",\n ".join(labels), file=output)
|
||||
print("};", file=output)
|
||||
|
||||
print("\ntemplate<class T> struct IsCategoricalLabelEnum : FalseType {};", file=output)
|
||||
for name,_,_ in enums:
|
||||
for name, _, _ in enums:
|
||||
print("template<> struct IsCategoricalLabelEnum<%s> : TrueType {};" % name, file=output)
|
||||
|
||||
print("\ntemplate<class T> struct CategoricalLabelId {};", file=output)
|
||||
for name,_,id in enums:
|
||||
for name, _, id in enums:
|
||||
print("template<> struct CategoricalLabelId<%s> : IntegralConstant<uint32_t, %s> {};" % (name, id), file=output)
|
||||
|
||||
# Footer.
|
||||
|
@ -88,7 +88,7 @@ class TypeChecker:
|
||||
(identifier, key,
|
||||
nice_type_name(self._args[0]),
|
||||
nice_type_name(type(x)))
|
||||
for k,v in value.iteritems():
|
||||
for k, v in value.iteritems():
|
||||
if not isinstance(x, self._args[1]):
|
||||
raise ValueError, "%s: failed dict type check for %s - expected value type %s for key %s, got %s" %\
|
||||
(identifier, key,
|
||||
@ -127,7 +127,7 @@ def type_check_event_fields(identifier, name, definition):
|
||||
raise KeyError(identifier + ' - unknown fields: ' + ', '.join(unknown_fields))
|
||||
|
||||
# Type-check fields.
|
||||
for k,v in definition.iteritems():
|
||||
for k, v in definition.iteritems():
|
||||
ALL_FIELDS[k].check(identifier, k, v)
|
||||
|
||||
|
||||
@ -310,7 +310,7 @@ def load_events(filename):
|
||||
# <event definition>
|
||||
# ...
|
||||
# ...
|
||||
for category_name,category in events.iteritems():
|
||||
for category_name, category in events.iteritems():
|
||||
string_check("top level structure", field='category', value=category_name,
|
||||
min_length=1, max_length=MAX_CATEGORY_NAME_LENGTH,
|
||||
regex=IDENTIFIER_PATTERN)
|
||||
@ -319,7 +319,7 @@ def load_events(filename):
|
||||
if not category or len(category) == 0:
|
||||
raise ValueError(category_name + ' must contain at least one entry')
|
||||
|
||||
for name,entry in category.iteritems():
|
||||
for name, entry in category.iteritems():
|
||||
string_check(category_name, field='event name', value=name,
|
||||
min_length=1, max_length=MAX_METHOD_NAME_LENGTH,
|
||||
regex=IDENTIFIER_PATTERN)
|
||||
|
@ -75,7 +75,7 @@ class StringTable:
|
||||
:param name: the name of the output array.
|
||||
"""
|
||||
entries = self.table.items()
|
||||
entries.sort(key=lambda x:x[1])
|
||||
entries.sort(key=lambda x: x[1])
|
||||
|
||||
# Avoid null-in-string warnings with GCC and potentially
|
||||
# overlong string constants; write everything out the long way.
|
||||
|
Loading…
Reference in New Issue
Block a user