From 2bc759778cc122ffcd69c1699388ec9426772e6e Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Thu, 12 Sep 2019 15:49:46 -0700
Subject: [PATCH] Keep pylint happy (#1008)

---
 src/gam.py |  5 +++--
 src/var.py | 48 +++++++++++++++++++++++++-----------------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/gam.py b/src/gam.py
index 3926853c..3e18e142 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -57,8 +57,6 @@ from urllib.parse import urlencode, urlparse
 from passlib.hash import sha512_crypt
 import dateutil.parser
 
-if platform.system() == 'Linux':
-  import distro
 import googleapiclient
 import googleapiclient.discovery
 import googleapiclient.errors
@@ -72,6 +70,9 @@ import httplib2
 import utils
 from var import *
 
+if platform.system() == 'Linux':
+  import distro
+
 # Finding path method varies between Python source, PyInstaller and StaticX
 if os.environ.get('STATICX_PROG_PATH', False):
   # StaticX static executable
diff --git a/src/var.py b/src/var.py
index 58c5f33f..32ce2386 100644
--- a/src/var.py
+++ b/src/var.py
@@ -382,30 +382,32 @@ GOOGLEDOC_VALID_EXTENSIONS_MAP = {
   }
 
 MACOS_CODENAMES = {
-                   6:  'Snow Leopard',
-                   7:  'Lion',
-                   8:  'Mountain Lion',
-                   9:  'Mavericks',
-                   10: 'Yosemite',
-                   11: 'El Capitan',
-                   12: 'Sierra',
-                   13: 'High Sierra',
-                   14: 'Mojave',
-                   15: 'Catalina'
-                  }
+  6:  'Snow Leopard',
+  7:  'Lion',
+  8:  'Mountain Lion',
+  9:  'Mavericks',
+  10: 'Yosemite',
+  11: 'El Capitan',
+  12: 'Sierra',
+  13: 'High Sierra',
+  14: 'Mojave',
+  15: 'Catalina'
+  }
 
-_MICROSOFT_FORMATS_LIST = [{'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'ext': '.docx'},
-                           {'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'ext': '.dotx'},
-                           {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'ext': '.pptx'},
-                           {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.template', 'ext': '.potx'},
-                           {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'ext': '.xlsx'},
-                           {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', 'ext': '.xltx'},
-                           {'mime': 'application/msword', 'ext': '.doc'},
-                           {'mime': 'application/msword', 'ext': '.dot'},
-                           {'mime': 'application/vnd.ms-powerpoint', 'ext': '.ppt'},
-                           {'mime': 'application/vnd.ms-powerpoint', 'ext': '.pot'},
-                           {'mime': 'application/vnd.ms-excel', 'ext': '.xls'},
-                           {'mime': 'application/vnd.ms-excel', 'ext': '.xlt'}]
+_MICROSOFT_FORMATS_LIST = [
+  {'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'ext': '.docx'},
+  {'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'ext': '.dotx'},
+  {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'ext': '.pptx'},
+  {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.template', 'ext': '.potx'},
+  {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'ext': '.xlsx'},
+  {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', 'ext': '.xltx'},
+  {'mime': 'application/msword', 'ext': '.doc'},
+  {'mime': 'application/msword', 'ext': '.dot'},
+  {'mime': 'application/vnd.ms-powerpoint', 'ext': '.ppt'},
+  {'mime': 'application/vnd.ms-powerpoint', 'ext': '.pot'},
+  {'mime': 'application/vnd.ms-excel', 'ext': '.xls'},
+  {'mime': 'application/vnd.ms-excel', 'ext': '.xlt'}
+  ]
 
 DOCUMENT_FORMATS_MAP = {
   'csv': [{'mime': 'text/csv', 'ext': '.csv'}],