From 507b5088d195b65c91c4c438b41a0da402a1f4d9 Mon Sep 17 00:00:00 2001
From: Tom Prince <mozilla@hocat.ca>
Date: Tue, 12 Dec 2017 22:42:23 -0700
Subject: [PATCH] Bug 1424967: Fix remaining lint error in upload_symbols.py;
 r=ted.mielczarek

MozReview-Commit-ID: LsvBXNy1SA6

--HG--
extra : rebase_source : 265b83adbb75eb644bcd530169a4e32c943008c1
---
 toolkit/crashreporter/tools/upload_symbols.py | 4 +++-
 tools/lint/flake8.yml                         | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/toolkit/crashreporter/tools/upload_symbols.py b/toolkit/crashreporter/tools/upload_symbols.py
index c284b05d63c8..10b33585411c 100644
--- a/toolkit/crashreporter/tools/upload_symbols.py
+++ b/toolkit/crashreporter/tools/upload_symbols.py
@@ -86,7 +86,8 @@ def main():
             return 1
         auth_token = open(token_file, 'r').read().strip()
     else:
-        log.error('You must set the SYMBOL_SECRET or SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE environment variables!')
+        log.error('You must set the SYMBOL_SECRET or SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE '
+                  'environment variables!')
         return 1
 
     # Allow overwriting of the upload url with an environmental variable
@@ -136,5 +137,6 @@ def main():
     print_error(r)
     return 1
 
+
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/tools/lint/flake8.yml b/tools/lint/flake8.yml
index 4c27def9a9d0..95d372f8f5a8 100644
--- a/tools/lint/flake8.yml
+++ b/tools/lint/flake8.yml
@@ -2,11 +2,11 @@
 flake8:
     description: Python linter
     include:
-        - build/moz.configure/*.configure
         - build/*.py
-        - configure.py
+        - build/moz.configure/*.configure
         - config/check_macroassembler_style.py
         - config/mozunit.py
+        - configure.py
         - layout/tools/reftest
         - python/mach
         - python/mach_commands.py
@@ -32,12 +32,13 @@ flake8:
         - testing/runcppunittests.py
         - testing/talos/
         - testing/xpcshell
+        - toolkit/components/telemetry
+        - toolkit/crashreporter/tools/upload_symbols.py
         - tools/git
         - tools/lint
         - tools/mach_commands.py
         - tools/mercurial
         - tools/tryselect
-        - toolkit/components/telemetry
     # Excludes should be added to topsrcdir/.flake8 due to a bug in flake8 where
     # specifying --exclude causes custom configuration files to be ignored.
     exclude: []