Ran black, updated to pylint 2.x

Author: evaherrada

.github/workflows/build.yml

@@ -40,7 +40,7 @@ jobs:
         source actions-ci/install.sh
     - name: Pip install pylint, black, & Sphinx
       run: |
-        pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
+        pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
     - name: Library version
       run: git describe --dirty --always --tags
     - name: PyLint

adafruit_focaltouch.py

@@ -75,6 +75,7 @@
 _FT6XXX_REG_VENDID = const(0xA8)
 _FT6XXX_REG_RELEASE = const(0xAF)
 
+
 class Adafruit_FocalTouch:
     """
     A driver for the FocalTech capacitive touch sensor.
@@ -88,7 +89,9 @@ def __init__(self, i2c, address=_FT6206_DEFAULT_I2C_ADDR, debug=False):
         self._debug = debug
 
         chip_data = self._read(_FT6XXX_REG_LIBH, 8)
-        lib_ver, chip_id, _, _, firm_id, _, vend_id = struct.unpack('>HBBBBBB', chip_data)
+        lib_ver, chip_id, _, _, firm_id, _, vend_id = struct.unpack(
+            ">HBBBBBB", chip_data
+        )
 
         if vend_id != 0x11:
             raise RuntimeError("Did not find FT chip")
@@ -109,7 +112,6 @@ def touched(self):
         """ Returns the number of touches currently detected """
         return self._read(_FT6XXX_REG_NUMTOUCHES, 1)[0]
 
-
     # pylint: disable=unused-variable
     @property
     def touches(self):
@@ -121,18 +123,19 @@ def touches(self):
         data = self._read(_FT6XXX_REG_DATA, 32)
 
         for i in range(2):
-            point_data = data[i*6+3 : i*6+9]
+            point_data = data[i * 6 + 3 : i * 6 + 9]
             if all([i == 0xFF for i in point_data]):
                 continue
-            #print([hex(i) for i in point_data])
-            x, y, weight, misc = struct.unpack('>HHBB', point_data)
-            #print(x, y, weight, misc)
+            # print([hex(i) for i in point_data])
+            x, y, weight, misc = struct.unpack(">HHBB", point_data)
+            # print(x, y, weight, misc)
             touch_id = y >> 12
             x &= 0xFFF
             y &= 0xFFF
-            point = {'x':x, 'y':y, 'id':touch_id}
+            point = {"x": x, "y": y, "id": touch_id}
             touchpoints.append(point)
         return touchpoints
+
     # pylint: enable=unused-variable
 
     def _read(self, register, length):
@@ -148,7 +151,7 @@ def _read(self, register, length):
     def _write(self, register, values):
         """Writes an array of 'length' bytes to the 'register'"""
         with self._i2c as i2c:
-            values = [(v & 0xFF) for v in [register]+values]
+            values = [(v & 0xFF) for v in [register] + values]
             i2c.write(bytes(values))
             if self._debug:
                 print("\t$%02X <= %s" % (values[0], [hex(i) for i in values[1:]]))

docs/conf.py

@@ -2,47 +2,55 @@
 
 import os
 import sys
-sys.path.insert(0, os.path.abspath('..'))
+
+sys.path.insert(0, os.path.abspath(".."))
 
 # -- General configuration ------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.viewcode',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.viewcode",
 ]
 
 # Uncomment the below if you use native CircuitPython modules such as
 # digitalio, micropython and busio. List the modules you use. Without it, the
 # autodoc module docs will fail to generate with a warning.
 # autodoc_mock_imports = ["adafruit_bus_device", "micropython"]
 
-intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
+intersphinx_mapping = {
+    "python": ("https://docs.python.org/3.4", None),
+    "BusDevice": (
+        "https://circuitpython.readthedocs.io/projects/busdevice/en/latest/",
+        None,
+    ),
+    "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
+}
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'Adafruit FocalTouch Library'
-copyright = u'2017 ladyada'
-author = u'ladyada'
+project = u"Adafruit FocalTouch Library"
+copyright = u"2017 ladyada"
+author = u"ladyada"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'1.0'
+version = u"1.0"
 # The full version, including alpha/beta/rc tags.
-release = u'1.0'
+release = u"1.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -54,7 +62,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.env', 'CODE_OF_CONDUCT.md']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".env", "CODE_OF_CONDUCT.md"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -66,7 +74,7 @@
 add_function_parentheses = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -80,68 +88,76 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
     try:
         import sphinx_rtd_theme
-        html_theme = 'sphinx_rtd_theme'
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']
+
+        html_theme = "sphinx_rtd_theme"
+        html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
     except:
-        html_theme = 'default'
-        html_theme_path = ['.']
+        html_theme = "default"
+        html_theme_path = ["."]
 else:
-    html_theme_path = ['.']
+    html_theme_path = ["."]
 
 # 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,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # The name of an image file (relative to this directory) to use as a favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
 #
-html_favicon = '_static/favicon.ico'
+html_favicon = "_static/favicon.ico"
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'AdafruitFocalTouchLibrarydoc'
+htmlhelp_basename = "AdafruitFocalTouchLibrarydoc"
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-     # The paper size ('letterpaper' or 'a4paper').
-     #
-     # 'papersize': 'letterpaper',
-
-     # The font size ('10pt', '11pt' or '12pt').
-     #
-     # 'pointsize': '10pt',
-
-     # Additional stuff for the LaTeX preamble.
-     #
-     # 'preamble': '',
-
-     # Latex figure (float) alignment
-     #
-     # 'figure_align': 'htbp',
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'AdafruitFocalTouchLibrary.tex', u'AdafruitFocalTouch Library Documentation',
-     author, 'manual'),
+    (
+        master_doc,
+        "AdafruitFocalTouchLibrary.tex",
+        u"AdafruitFocalTouch Library Documentation",
+        author,
+        "manual",
+    ),
 ]
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'AdafruitFocalTouchlibrary', u'Adafruit FocalTouch Library Documentation',
-     [author], 1)
+    (
+        master_doc,
+        "AdafruitFocalTouchlibrary",
+        u"Adafruit FocalTouch Library Documentation",
+        [author],
+        1,
+    )
 ]
 
 # -- Options for Texinfo output -------------------------------------------
@@ -150,7 +166,13 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'AdafruitFocalTouchLibrary', u'Adafruit FocalTouch Library Documentation',
-     author, 'AdafruitFocalTouchLibrary', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "AdafruitFocalTouchLibrary",
+        u"Adafruit FocalTouch Library Documentation",
+        author,
+        "AdafruitFocalTouchLibrary",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]

examples/focaltouch_paint_simpletest.py

@@ -27,8 +27,8 @@
 while True:
     if ft.touched:
         ts = ft.touches
-        point = ts[0]   # the shield only supports one point!
+        point = ts[0]  # the shield only supports one point!
         # perform transformation to get into display coordinate system!
-        y = 320 - point['y']
-        x = 240 - point['x']
-        display.fill_rectangle(x-2, y-2, 4, 4, color565(255, 255, 255))
+        y = 320 - point["y"]
+        x = 240 - point["x"]
+        display.fill_rectangle(x - 2, y - 2, 4, 4, color565(255, 255, 255))

examples/focaltouch_print_touches.py

@@ -18,6 +18,6 @@
     if ft.touched:
         print(ft.touches)
     else:
-        print('no touch')
+        print("no touch")
 
-    time.sleep(.15)
+    time.sleep(0.15)

setup.py

@@ -7,55 +7,47 @@
 
 # Always prefer setuptools over distutils
 from setuptools import setup, find_packages
+
 # To use a consistent encoding
 from codecs import open
 from os import path
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
-with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+with open(path.join(here, "README.rst"), encoding="utf-8") as f:
     long_description = f.read()
 
 setup(
-    name='adafruit-circuitpython-focaltouch',
-
+    name="adafruit-circuitpython-focaltouch",
     use_scm_version=True,
-    setup_requires=['setuptools_scm'],
-
-    description='CircuitPython Focaltouch library for capacitive touch displays.',
+    setup_requires=["setuptools_scm"],
+    description="CircuitPython Focaltouch library for capacitive touch displays.",
     long_description=long_description,
-    long_description_content_type='text/x-rst',
-
+    long_description_content_type="text/x-rst",
     # The project's main homepage.
-    url='https://github.com/adafruit/Adafruit_CircuitPython_Focaltouch',
-
+    url="https://github.com/adafruit/Adafruit_CircuitPython_Focaltouch",
     # Author details
-    author='Adafruit Industries',
-    author_email='[email protected]',
-
-    install_requires=['Adafruit-Blinka', 'adafruit-circuitpython-busdevice'],
-
+    author="Adafruit Industries",
+    author_email="[email protected]",
+    install_requires=["Adafruit-Blinka", "adafruit-circuitpython-busdevice"],
     # Choose your license
-    license='MIT',
-
+    license="MIT",
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Libraries',
-        'Topic :: System :: Hardware',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Libraries",
+        "Topic :: System :: Hardware",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
     ],
-
     # What does your project relate to?
-    keywords='adafruit focaltouch capacitive touch screen display touchscreen'
-             'hardware micropython circuitpython',
-
+    keywords="adafruit focaltouch capacitive touch screen display touchscreen"
+    "hardware micropython circuitpython",
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
-    py_modules=['adafruit_focaltouch'],
+    py_modules=["adafruit_focaltouch"],
 )