Commit 1e231d1b authored by Andrew Halberstadt's avatar Andrew Halberstadt
Browse files

Bug 1567642 - [telemetry] Fix flake8 under Python 3 lint issues r=chutten,janerik 

Depends on D45414

Differential Revision: https://phabricator.services.mozilla.com/D45415

--HG--
extra : moz-landing-system : lando
parent c0a039e7

toolkit/components/telemetry/build_scripts/gen_histogram_phf.py

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ def main(output, *filenames): 
    output.write(name_phf.cxx_codegen(

        name='HistogramIDByNameLookup',

        entry_type="uint32_t",

        lower_entry=lambda (_, v): str(v),

        lower_entry=lambda x: str(x[1]),

        key_type="const nsACString&",

        key_bytes="aKey.BeginReading()",

        key_length="aKey.Length()"))

toolkit/components/telemetry/build_scripts/mozparsers/parse_events.py

+2 −2
Original line number Diff line number Diff line
@@ -350,9 +350,9 @@ def load_events(filename, strict_type_checks): 
    try:

        with open(filename, 'r') as f:

            events = yaml.safe_load(f)

    except IOError, e:

    except IOError as e:

        ParserError('Error opening ' + filename + ': ' + e.message + ".").handle_now()

    except ParserError, e:

    except ParserError as e:

        ParserError('Error parsing events in ' + filename + ': ' + e.message + ".").handle_now()



    event_list = []

toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ def from_Histograms_json(filename, strict_type_checks): 
            def hook(ps):

                return load_histograms_into_dict(ps, strict_type_checks)

            histograms = json.load(f, object_pairs_hook=hook)

        except ValueError, e:

        except ValueError as e:

            ParserError("error parsing histograms in %s: %s" % (filename, e.message)).handle_now()

    return histograms

toolkit/components/telemetry/build_scripts/mozparsers/parse_scalars.py

+2 −2
Original line number Diff line number Diff line
@@ -365,9 +365,9 @@ def load_scalars(filename, strict_type_checks=True): 
    try:

        with open(filename, 'r') as f:

            scalars = yaml.safe_load(f)

    except IOError, e:

    except IOError as e:

        ParserError('Error opening ' + filename + ': ' + e.message).handle_now()

    except ValueError, e:

    except ValueError as e:

        ParserError('Error parsing scalars in {}: {}'

                    '.\nSee: {}'.format(filename, e.message, BASE_DOC_URL)).handle_now()

toolkit/components/telemetry/build_scripts/mozparsers/shared_telemetry_utils.py

+2 −2
Original line number Diff line number Diff line
@@ -244,8 +244,8 @@ def load_yaml_file(filename): 
    try:

        with open(filename, 'r') as f:

            return yaml.safe_load(f)

    except IOError, e:

    except IOError as e:

        raise ParserError('Error opening ' + filename + ': ' + e.message)

    except ValueError, e:

    except ValueError as e:

        raise ParserError('Error parsing processes in {}: {}'

                          .format(filename, e.message))