Merge pull request #88 from radarhere/lint

Lint fixes

Author: manisandro

Diff for: doc/conf.py

@@ -15,6 +15,8 @@
 import sys
 import os
 
+import sane
+
 # -- Mock module for _sane
 try:
     from unittest.mock import MagicMock
@@ -25,20 +27,24 @@ def __getattr__(cls, name):
             return Mock()
 
     sys.modules.update([('_sane', Mock())])
-except:
+except Exception:
     pass
 
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-libbuilddir = "lib.{p}-{v[0]}.{v[1]}".format(p=sysconfig.get_platform(), v=sys.version_info)
-sys.path.insert(0, os.path.join(os.path.abspath('.'), '..', 'build', libbuilddir))
+libbuilddir = "lib.{p}-{v[0]}.{v[1]}".format(
+  p=sysconfig.get_platform(), v=sys.version_info
+)
+sys.path.insert(
+  0, os.path.join(os.path.abspath('.'), '..', 'build', libbuilddir)
+)
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -55,7 +61,7 @@ def __getattr__(cls, name):
 source_suffix = '.rst'
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
 master_doc = 'index'
@@ -68,49 +74,48 @@ def __getattr__(cls, name):
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-import sane
 # The short X.Y version.
 version = sane.__version__
 # The full version, including alpha/beta/rc tags.
 release = sane.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+# keep_warnings = False
 
 
 # -- Options for HTML output ----------------------------------------------
@@ -122,26 +127,26 @@ def __getattr__(cls, name):
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -151,48 +156,48 @@ def __getattr__(cls, name):
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-#html_extra_path = []
+# html_extra_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'python-sanedoc'
@@ -201,14 +206,14 @@ def __getattr__(cls, name):
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+  # The paper size ('letterpaper' or 'a4paper').
+  # 'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+  # The font size ('10pt', '11pt' or '12pt').
+  # 'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+  # Additional stuff for the LaTeX preamble.
+  # 'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
@@ -221,23 +226,23 @@ def __getattr__(cls, name):
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output ---------------------------------------
@@ -250,7 +255,7 @@ def __getattr__(cls, name):
 ]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -261,18 +266,19 @@ def __getattr__(cls, name):
 texinfo_documents = [
   ('index', 'python-sane', 'python-sane Documentation',
    'Andrew Kuchling, Ralph Heinkel, Sandro Mani', 'python-sane',
-   'Provides an interface to the SANE scanner and frame grabber interface for Linux',
+   'Provides an interface to the SANE scanner and frame grabber interface for'
+   ' Linux',
    'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+# texinfo_no_detailmenu = False

Diff for: example.py

@@ -33,22 +33,26 @@
 params = dev.get_parameters()
 try:
     dev.depth = depth
-except:
+except Exception:
     print('Cannot set depth, defaulting to %d' % params[3])
 
 try:
     dev.mode = mode
-except:
+except Exception:
     print('Cannot set mode, defaulting to %s' % params[0])
 
 try:
     dev.br_x = 320.
     dev.br_y = 240.
-except:
+except Exception:
     print('Cannot set scan area, using default')
 
 params = dev.get_parameters()
-print('Device parameters:', params, "\n Resolutions %d, x %d, y %d "%(dev.resolution, dev.x_resolution, dev.y_resolution))
+print(
+    'Device parameters:', params,
+    '\n Resolutions %d, x %d, y %d '
+    % (dev.resolution, dev.x_resolution, dev.y_resolution)
+)
 
 #
 # Start a scan and get a PIL.Image object
@@ -72,7 +76,7 @@
     arr = (arr / 255).astype(numpy.uint8)
 
 # reshape needed by PIL library
-arr=arr.reshape(arr.shape[2],arr.shape[1],arr.shape[0])
+arr = arr.reshape(arr.shape[2], arr.shape[1], arr.shape[0])
 if params[0] == 'color':
     im = Image.frombytes('RGB', arr.shape[1:], arr.tostring(), 'raw', 'RGB', 0,
                          1)

Diff for: sane.py

@@ -118,7 +118,7 @@ def __iter__(self):
     def __del__(self):
         try:
             self.device.cancel()
-        except:
+        except Exception:
             # In case device was already closed
             pass
 
@@ -294,7 +294,7 @@ def snap(self, no_cancel=False, progress=None):
         """
         try:
             from PIL import Image
-        except:
+        except ImportError:
             raise RuntimeError("Cannot import PIL.Image")
         result = self.dev.snap(no_cancel, False, progress)
         data, width, height, samples, sampleSize = result
@@ -323,7 +323,7 @@ def arr_snap(self, progress=None):
         """
         try:
             import numpy
-        except:
+        except ImportError:
             raise RuntimeError("Cannot import numpy")
         result = self.dev.snap(False, True, progress)
         data, width, height, samples, sampleSize = result