corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1344834 - Enable flake8 rule E501: 'line too long (113 > 99 characters)'. r=Dexter

Browse Source
This commit is contained in:
Avikalpa Kundu
2017-05-03 06:38:00 +02:00
parent 37ca18f7a1
commit c2cf02e97d
7 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
toolkit/components/telemetry/histogram_tools.py
View File

@@ -69,7 +69,8 @@ always_allowed_keys = ['kind', 'description', 'cpp_guard', 'expires_in_version',
whitelists = None
try:
whitelist_path = os.path.join(os.path.abspath(os.path.realpath(os.path.dirname(__file__))), 'histogram-whitelists.json')
whitelist_path = os.path.join(os.path.abspath(os.path.realpath(os.path.dirname(__file__))),
'histogram-whitelists.json')
with open(whitelist_path, 'r') as f:
try:
whitelists = json.load(f)
@@ -79,7 +80,8 @@ try:
raise ParserError('Error parsing whitelist: %s' % whitelist_path)
except IOError:
whitelists = None
print 'Unable to parse whitelist: %s.\nAssuming all histograms are acceptable.' % whitelist_path
print('Unable to parse whitelist: %s.\nAssuming all histograms are acceptable.' %
whitelist_path)
class Histogram:
@@ -237,7 +239,8 @@ associated with the histogram. Returns None if no guarding is necessary."""
# Avoid C++ identifier conflicts between histogram enums and label enum names.
if name.startswith("LABELS_"):
raise ParserError('Error for histogram name "%s": can not start with "LABELS_".' % (name))
raise ParserError('Error for histogram name "%s": can not start with "LABELS_".' %
(name))
# To make it easier to generate C++ identifiers from this etc., we restrict
# the histogram names to a strict pattern.
@@ -245,7 +248,8 @@ associated with the histogram. Returns None if no guarding is necessary."""
if self._strict_type_checks:
pattern = '^[a-z][a-z0-9_]+[a-z0-9]$'
if not re.match(pattern, name, re.IGNORECASE):
raise ParserError('Error for histogram name "%s": name does not conform to "%s"' % (name, pattern))
raise ParserError('Error for histogram name "%s": name does not conform to "%s"' %
(name, pattern))
def check_expiration(self, name, definition):
field = 'expires_in_version'
@@ -330,7 +334,8 @@ associated with the histogram. Returns None if no guarding is necessary."""
if field not in definition and name not in whitelists[field]:
raise ParserError('New histogram "%s" must have a "%s" field.' % (name, field))
if field in definition and name in whitelists[field]:
msg = 'Histogram "%s" should be removed from the whitelist for "%s" in histogram-whitelists.json.'
msg = 'Histogram "%s" should be removed from the whitelist for "%s" in ' \
'histogram-whitelists.json.'
raise ParserError(msg % (name, field))
def check_field_types(self, name, definition):
@@ -387,8 +392,8 @@ associated with the histogram. Returns None if no guarding is necessary."""
if key not in definition:
continue
if not all(isinstance(x, key_type) for x in definition[key]):
raise ParserError('All values for list "{0}" in histogram "{1}" should be of type {2}.'
.format(key, name, nice_type_name(key_type)))
raise ParserError('All values for list "{0}" in histogram "{1}" should be of type'
' {2}.'.format(key, name, nice_type_name(key_type)))
def check_keys(self, name, definition, allowed_keys):
for key in definition.iterkeys():
@@ -401,11 +406,14 @@ associated with the histogram. Returns None if no guarding is necessary."""
self._n_buckets = n_buckets
if whitelists is not None and self._n_buckets > 100 and type(self._n_buckets) is int:
if self._name not in whitelists['n_buckets']:
raise ParserError('New histogram "%s" is not permitted to have more than 100 buckets.\n'
'Histograms with large numbers of buckets use disproportionately high amounts of resources. '
'Contact a Telemetry peer (e.g. in #telemetry) if you think an exception ought to be made:\n'
'https://wiki.mozilla.org/Modules/Toolkit#Telemetry'
% self._name)
raise ParserError(
'New histogram "%s" is not permitted to have more than 100 buckets.\n'
'Histograms with large numbers of buckets use disproportionately high'
' amounts of resources. Contact a Telemetry peer (e.g. in #telemetry)'
' if you think an exception ought to be made:\n'
'https://wiki.mozilla.org/Modules/Toolkit#Telemetry'
% self._name
)
@staticmethod
def boolean_flag_bucket_parameters(definition):
@@ -425,7 +433,8 @@ associated with the histogram. Returns None if no guarding is necessary."""
@staticmethod
def categorical_bucket_parameters(definition):
# Categorical histograms default to 50 buckets to make working with them easier.
# Otherwise when adding labels later we run into problems with the pipeline not supporting bucket changes.
# Otherwise when adding labels later we run into problems with the pipeline not
# supporting bucket changes.
# This can be overridden using the n_values field.
n_values = max(len(definition['labels']),
definition.get('n_values', 0),
@@ -463,7 +472,8 @@ associated with the histogram. Returns None if no guarding is necessary."""
value = definition.get('releaseChannelCollection', 'opt-in')
if value not in datasets:
raise ParserError('Unknown value for releaseChannelCollection policy for histogram "%s".' % self._name)
raise ParserError('Unknown value for releaseChannelCollection'
' policy for histogram "%s".' % self._name)
self._dataset = "nsITelemetry::" + datasets[value]
@@ -567,12 +577,14 @@ the histograms defined in filenames.
if n_counters != len(use_counter_indices):
raise ParserError("Use counter histograms must be defined in a contiguous block.")
# Check that histograms that were removed from Histograms.json etc. are also removed from the whitelists.
# Check that histograms that were removed from Histograms.json etc.
# are also removed from the whitelists.
if whitelists is not None:
all_whitelist_entries = itertools.chain.from_iterable(whitelists.itervalues())
orphaned = set(all_whitelist_entries) - set(all_histograms.keys())
if len(orphaned) > 0:
msg = 'The following entries are orphaned and should be removed from histogram-whitelists.json:\n%s'
msg = 'The following entries are orphaned and should be removed from ' \
'histogram-whitelists.json:\n%s'
raise ParserError(msg % (', '.join(sorted(orphaned))))
for (name, definition) in all_histograms.iteritems():