Merge pull request #1207 from lukeyeager/python-lint

Fix remaining Python lint

digits-walkthrough

@@ -15,13 +15,17 @@ from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.keys import Keys
 
 wait_time = 2
+
+
 def wait(s=wait_time):
     time.sleep(s)
 
+
 def get_page(driver, url):
     driver.get(url)
     wait()
 
+
 def create_dataset(driver, name, folder):
     dropdown_elements = driver.find_elements_by_class_name('dropdown-toggle')
     dropdown_dataset = dropdown_elements[0]
@@ -88,6 +92,7 @@ def create_dataset(driver, name, folder):
         wait()
     wait()
 
+
 def create_model(driver, name, dataset_name, test_image):
     dropdown_elements = driver.find_elements_by_class_name('dropdown-toggle')
     dropdown_model = dropdown_elements[1]
@@ -135,7 +140,7 @@ def create_model(driver, name, dataset_name, test_image):
         status = json.loads(r.content)
         done = status['status'] == 'Done'
         wait()
-        #driver.refresh()
+        # driver.refresh()
 
     # test image
     print 'Testing...'
@@ -162,21 +167,21 @@ def create_model(driver, name, dataset_name, test_image):
 def main(argv):
     parser = argparse.ArgumentParser(description='Run a Selenium demo of DIGITS')
 
-    ### Positional arguments
+    # Positional arguments
 
     parser.add_argument('mnist_image_folder',
-            type=str,
-            help='Path to the MNIST dataset folder')
+                        type=str,
+                        help='Path to the MNIST dataset folder')
     parser.add_argument('test_image',
-            type=str,
-            help='Image to test with')
+                        type=str,
+                        help='Image to test with')
 
-    ### Optional arguments
+    # Optional arguments
 
     parser.add_argument('-p', '--port',
-            type=int,
-            default=80,
-            help='Port the server is running on (default 80)')
+                        type=int,
+                        default=80,
+                        help='Port the server is running on (default 80)')
 
     args = vars(parser.parse_args())
 
@@ -209,7 +214,7 @@ def main(argv):
 
         print 'Done.'
 
-        #display an alert message
+        # display an alert message
         get_page(driver, "javascript:alert('Completed Walkthrough!');void(0);")
         wait()
         driver.switch_to_alert().accept()
@@ -233,4 +238,3 @@ def main(argv):
 
 if __name__ == '__main__':
     main(sys.argv)
-

digits/__init__.py

@@ -2,3 +2,5 @@
 from __future__ import absolute_import
 
 from .version import __version__
+
+__all__ = ['__version__']

digits/__main__.py

@@ -18,19 +18,23 @@
 
 def main():
     parser = argparse.ArgumentParser(description='DIGITS server')
-    parser.add_argument('-p', '--port',
-            type=int,
-            default=5000,
-            help='Port to run app on (default 5000)'
-            )
-    parser.add_argument('-d', '--debug',
-            action='store_true',
-            help='Run the application in debug mode (reloads when the source changes and gives more detailed error messages)'
-            )
-    parser.add_argument('--version',
-            action='store_true',
-            help='Print the version number and exit'
-            )
+    parser.add_argument(
+        '-p', '--port',
+        type=int,
+        default=5000,
+        help='Port to run app on (default 5000)'
+    )
+    parser.add_argument(
+        '-d', '--debug',
+        action='store_true',
+        help=('Run the application in debug mode (reloads when the source '
+              'changes and gives more detailed error messages)')
+    )
+    parser.add_argument(
+        '--version',
+        action='store_true',
+        help='Print the version number and exit'
+    )
 
     args = vars(parser.parse_args())
 

digits/config/__init__.py

@@ -4,17 +4,19 @@
 # Create this object before importing the following imports, since they edit the list
 option_list = {}
 
-from . import caffe
-from . import gpu_list
-from . import jobs_dir
-from . import log_file
-from . import torch
-from . import server_name
-from . import store_option
+from . import (  # noqa
+    caffe,
+    gpu_list,
+    jobs_dir,
+    log_file,
+    torch,
+    server_name,
+    store_option,
+)
+
 
 def config_value(option):
     """
     Return the current configuration value for the given option
     """
     return option_list[option]
-

digits/config/caffe.py

@@ -11,7 +11,6 @@
 from . import option_list
 from digits import device_query
 from digits.utils import parse_version
-from digits.utils.errors import UnsupportedPlatformError
 
 
 def load_from_envvar(envvar):
@@ -93,7 +92,7 @@ def is_pycaffe_in_dir(dirname=None):
         sys.path = [dirname]  # temporarily replace sys.path
     try:
         imp.find_module('caffe')
-    except ImportError as e:
+    except ImportError:
         return False
     finally:
         sys.path = old_path
@@ -118,7 +117,7 @@ def import_pycaffe(dirname=None):
 
     # for Windows environment, loading h5py before caffe solves the issue mentioned in
     # https://github.com/NVIDIA/DIGITS/issues/47#issuecomment-206292824
-    import h5py
+    import h5py  # noqa
     try:
         import caffe
     except ImportError:
@@ -153,7 +152,7 @@ def get_version_and_flavor(executable):
 
     version = parse_version(version_string)
 
-    if parse_version(0,99,0) > version > parse_version(0,9,0):
+    if parse_version(0, 99, 0) > version > parse_version(0, 9, 0):
         flavor = 'NVIDIA'
         minimum_version = '0.11.0'
         if version < parse_version(minimum_version):
@@ -167,7 +166,6 @@ def get_version_and_flavor(executable):
 
 
 def get_version_from_pycaffe():
-    import caffe
     try:
         from caffe import __version__ as version
         return version
@@ -185,7 +183,7 @@ def get_version_from_cmdline(executable):
     pattern = 'version'
     for line in p.stdout:
         if pattern in line:
-            return line[line.find(pattern) + len(pattern)+1:].strip()
+            return line[line.find(pattern) + len(pattern) + 1:].strip()
     return None
 
 
@@ -220,7 +218,6 @@ def get_version_from_soname(executable):
         return None
 
 
-
 if 'CAFFE_ROOT' in os.environ:
     executable, version, flavor = load_from_envvar('CAFFE_ROOT')
 elif 'CAFFE_HOME' in os.environ:
@@ -232,7 +229,6 @@ def get_version_from_soname(executable):
     'executable': executable,
     'version': version,
     'flavor': flavor,
-    'multi_gpu': (flavor == 'BVLC' or parse_version(version) >= parse_version(0,12)),
+    'multi_gpu': (flavor == 'BVLC' or parse_version(version) >= parse_version(0, 12)),
     'cuda_enabled': (len(device_query.get_devices()) > 0),
 }
-

digits/config/gpu_list.py

@@ -6,4 +6,3 @@
 
 
 option_list['gpu_list'] = ','.join([str(x) for x in xrange(len(digits.device_query.get_devices()))])
-

digits/config/jobs_dir.py

@@ -32,4 +32,3 @@
 
 
 option_list['jobs_dir'] = value
-

digits/config/log_file.py

@@ -3,7 +3,6 @@
 
 import logging
 import os
-import sys
 
 from . import option_list
 import digits
@@ -23,7 +22,6 @@ def load_logfile_filename():
     else:
         filename = os.path.join(os.path.dirname(digits.__file__), 'digits.log')
 
-
     if filename is not None:
         try:
             filename = os.path.abspath(filename)
@@ -61,7 +59,9 @@ def load_logfile_level():
         elif level == 'critical':
             return logging.CRITICAL
         else:
-            raise ValueError('Invalid value "%s" for logfile_level. Set DIGITS_LOGFILE_LEVEL to fix       your configuration.' % level)
+            raise ValueError(
+                'Invalid value "%s" for logfile_level. '
+                'Set DIGITS_LOGFILE_LEVEL to fix your configuration.' % level)
     else:
         return logging.INFO
 
@@ -70,4 +70,3 @@ def load_logfile_level():
     'filename': load_logfile_filename(),
     'level': load_logfile_level(),
 }
-

digits/config/server_name.py

@@ -12,4 +12,3 @@
     value = platform.node()
 
 option_list['server_name'] = value
-

digits/config/store_option.py

@@ -6,6 +6,7 @@
 
 from . import option_list
 
+
 def validate(value):
     if value == '':
         return value
@@ -19,6 +20,7 @@ def validate(value):
                 raise ValueError('"%s" is not a valid URL' % url)
     return ','.join(valid_url_list)
 
+
 def load_url_list():
     """
     Return Model Store URL's as a list
@@ -34,4 +36,3 @@ def load_url_list():
 option_list['model_store'] = {
     'url_list': load_url_list()
 }
-

digits/config/torch.py

@@ -53,4 +53,3 @@ def find_executable(path=None):
         'enabled': True,
         'executable': executable,
     }
-

digits/dataset/__init__.py

@@ -1,6 +1,13 @@
 # Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
 from __future__ import absolute_import
 
-from .images import *
-from .generic import *
+from .images import ImageClassificationDatasetJob, GenericImageDatasetJob
+from .generic import GenericDatasetJob
 from .job import DatasetJob
+
+__all__ = [
+    'ImageClassificationDatasetJob',
+    'GenericImageDatasetJob',
+    'GenericDatasetJob',
+    'DatasetJob',
+]

digits/dataset/forms.py

@@ -6,16 +6,17 @@
 
 from digits import utils
 
+
 class DatasetForm(Form):
     """
     Defines the form used to create a new Dataset
     (abstract class)
     """
 
     dataset_name = utils.forms.StringField(u'Dataset Name',
-            validators=[DataRequired()]
-            )
+                                           validators=[DataRequired()]
+                                           )
 
     group_name = utils.forms.StringField('Group Name',
-            tooltip = "An optional group name for organization on the main page."
-            )
+                                         tooltip="An optional group name for organization on the main page."
+                                         )

digits/dataset/generic/__init__.py

@@ -2,3 +2,5 @@
 from __future__ import absolute_import
 
 from .job import GenericDatasetJob
+
+__all__ = ['GenericDatasetJob']