Merge pull request gpiozero#673 from ricksbt/master

Minor fixes for Python 3.7

Author: bennuttall

gpiozero/boards.py

@@ -100,7 +100,7 @@ class ButtonBoard(HoldMixin, CompositeDevice):
     Extends :class:`CompositeDevice` and represents a generic button board or
     collection of buttons.
 
-    :param int \*pins:
+    :param int \\*pins:
         Specify the GPIO pins that the buttons of the board are attached to.
         You can designate as many pins as necessary.
 
@@ -133,7 +133,7 @@ class ButtonBoard(HoldMixin, CompositeDevice):
         See :doc:`api_pins` for more information (this is an advanced feature
         which most users can ignore).
 
-    :param \*\*named_pins:
+    :param \\*\\*named_pins:
         Specify GPIO pins that buttons of the board are attached to,
         associating each button with a property name. You can designate as
         many pins as necessary and use any names, provided they're not already
@@ -280,7 +280,7 @@ class LEDBoard(LEDCollection):
         leds = LEDBoard(2, 3, 4, 5, 6)
         leds.on()
 
-    :param int \*pins:
+    :param int \\*pins:
         Specify the GPIO pins that the LEDs of the board are attached to. You
         can designate as many pins as necessary. You can also specify
         :class:`LEDBoard` instances to create trees of LEDs.
@@ -307,7 +307,7 @@ class LEDBoard(LEDCollection):
         See :doc:`api_pins` for more information (this is an advanced feature
         which most users can ignore).
 
-    :param \*\*named_pins:
+    :param \\*\\*named_pins:
         Specify GPIO pins that LEDs of the board are attached to, associating
         each LED with a property name. You can designate as many pins as
         necessary and use any names, provided they're not already in use by
@@ -497,7 +497,7 @@ class LEDBarGraph(LEDCollection):
 
         pause()
 
-    :param int \*pins:
+    :param int \\*pins:
         Specify the GPIO pins that the LEDs of the bar graph are attached to.
         You can designate as many pins as necessary.
 
@@ -896,7 +896,7 @@ class StatusZero(LEDBoard):
         status.wifi.green.on()
         status.raining.red.on()
 
-    :param str \*labels:
+    :param str \\*labels:
         Specify the names of the labels you wish to designate the strips to.
         You can list up to three labels. If no labels are given, three strips
         will be initialised with names 'one', 'two', and 'three'. If some, but
@@ -952,7 +952,7 @@ class StatusBoard(CompositeOutputDevice):
         status.wifi.lights.green.on()
         status.wifi.button.when_pressed = status.wifi.lights.toggle
 
-    :param str \*labels:
+    :param str \\*labels:
         Specify the names of the labels you wish to designate the strips to.
         You can list up to five labels. If no labels are given, five strips
         will be initialised with names 'one' to 'five'. If some, but not all

gpiozero/compat.py

@@ -10,10 +10,14 @@
 
 import cmath
 import weakref
-import collections
 import operator
 import functools
 
+# Handles pre 3.3 versions of Python withoout collections.abc
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
 
 # Back-ported from python 3.5; see
 # github.com/PythonCHB/close_pep/blob/master/is_close.py for original
@@ -57,7 +61,7 @@ def median(data):
 
 
 # Copied from the MIT-licensed https://github.com/slezica/python-frozendict
-class frozendict(collections.Mapping):
+class frozendict(Mapping):
     def __init__(self, *args, **kwargs):
         self.__dict = dict(*args, **kwargs)
         self.__hash = None

gpiozero/pins/__init__.py

@@ -522,9 +522,9 @@ def clock_phase(self):
             ----'   `---'   `---'   `---'   `---'   `---'   `---'   `-------
                 :       :       :       :       :       :       :
             MISO---.   ,---.   ,---.   ,---.   ,---.   ,---.   ,---.
-              /     \ /     \ /     \ /     \ /     \ /     \ /     \\
+              /     \\ /     \\ /     \\ /     \\ /     \\ /     \\ /     \\
             -{  Bit  X  Bit  X  Bit  X  Bit  X  Bit  X  Bit  X  Bit  }------
-              \     / \     / \     / \     / \     / \     / \     /
+              \\     / \\     / \\     / \\     / \\     / \\     / \\     /
                `---'   `---'   `---'   `---'   `---'   `---'   `---'
 
         The following diagram indicates when data is read when
@@ -539,9 +539,9 @@ def clock_phase(self):
             ----'   `---'   `---'   `---'   `---'   `---'   `---'   `-------
                     :       :       :       :       :       :       :
             MISO   ,---.   ,---.   ,---.   ,---.   ,---.   ,---.   ,---.
-                  /     \ /     \ /     \ /     \ /     \ /     \ /     \\
+                  /     \\ /     \\ /     \\ /     \\ /     \\ /     \\ /     \\
             -----{  Bit  X  Bit  X  Bit  X  Bit  X  Bit  X  Bit  X  Bit  }--
-                  \     / \     / \     / \     / \     / \     / \     /
+                  \\     / \\     / \\     / \\     / \\     / \\     / \\     /
                    `---'   `---'   `---'   `---'   `---'   `---'   `---'
         """
         return bool(self.clock_mode & 1)