minor clean-ups and formatting

docs/devices.md

@@ -73,6 +73,7 @@ Mice:
 | Device           | HID++ | Battery | DPI   | Other supported features        |
 |------------------|-------|---------|-------|---------------------------------|
 | M215             | 1.0   | yes     |       |                                 |
+| M305             |       |         |       |                                 |
 | M310             |       |         |       |                                 |
 | M315             |       |         |       |                                 |
 | M325             |       |         |       |                                 |

lib/logitech/unifying_receiver/descriptors.py

@@ -4,8 +4,6 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from collections import namedtuple
-
 from .common import NamedInts as _NamedInts
 from . import hidpp10 as _hidpp10
 from . import hidpp20 as _hidpp20
@@ -15,13 +13,15 @@ from . import settings as _settings
 # common strings for settings
 #
 
-_SMOOTH_SCROLL = ('smooth-scroll', 'Smooth Scrolling', 'High-sensitivity mode for vertical scroll with the wheel.')
+_SMOOTH_SCROLL = ('smooth-scroll', 'Smooth Scrolling',
+							'High-sensitivity mode for vertical scroll with the wheel.')
 _DPI = ('dpi', 'Sensitivity (DPI)', None)
-_FN_SWAP = ('fn-swap', 'Swap Fx function', ('When set, the F1..F12 keys will activate their special function,\n'
-						 					'and you must hold the FN key to activate their standard function.\n'
-						 					'\n'
-						 					'When unset, the F1..F12 keys will activate their standard function,\n'
-						 					'and you must hold the FN key to activate their special function.'))
+_FN_SWAP = ('fn-swap', 'Swap Fx function',
+							('When set, the F1..F12 keys will activate their special function,\n'
+						 	'and you must hold the FN key to activate their standard function.\n'
+						 	'\n'
+						 	'When unset, the F1..F12 keys will activate their standard function,\n'
+						 	'and you must hold the FN key to activate their special function.'))
 
 # this register is only applicable to HID++ 1.0 devices, it should not exist with HID++ 2.0 devices
 # using Features
@@ -56,8 +56,10 @@ def check_features(device, already_known):
 #
 #
 
+from collections import namedtuple
 _DeviceDescriptor = namedtuple('_DeviceDescriptor',
 				['name', 'kind', 'product_id', 'codename', 'protocol', 'registers', 'settings'])
+del namedtuple
 
 DEVICES = {}
 
@@ -158,6 +160,8 @@ _D('Wireless Illuminated Keyboard K800', protocol=1.0,
 # Mice
 
 _D('Wireless Mouse M215', protocol=1.0)
+_D('Wireless Mouse M305')
+_D('Wireless Mouse M310')
 _D('Wireless Mouse M315')
 _D('Wireless Mouse M325')
 _D('Wireless Mouse M505')
@@ -212,5 +216,3 @@ _D('VX Nano Cordless Laser Mouse', codename='VX Nano', protocol=1.0, product_id=
 							_register_smooth_scroll(0x01, true_value=0x40, mask=0x40),
 						],
 				)
-
-del namedtuple

lib/solaar/ui/window.py

@@ -36,7 +36,7 @@ _COLUMN = _NamedInts(PATH=0, NUMBER=1, ACTIVE=2, NAME=3, ICON=4, STATUS_ICON=5,
 _COLUMN_TYPES = (str, int, bool, str, str, str, TYPE_PYOBJECT)
 _TREE_SEPATATOR = (None, 0, False, None, None, None, None)
 
-_TOOLTIP_LINK_SECURE = 'The wireless link between this device and its receiver is not encrypted.'
+_TOOLTIP_LINK_SECURE = 'The wireless link between this device and its receiver is encrypted.'
 _TOOLTIP_LINK_INSECURE = ('The wireless link between this device and its receiver is not encrypted.\n'
 						'\n'
 						'For pointing devices (mice, trackballs, trackpads), this is a minor security issue.\n'

lib/solaar/upower.py

@@ -36,7 +36,7 @@ def watch(on_resume_callback, on_suspend_callback):
 
 
 try:
-	import dbus      # for dbus communication (obviously)
+	import dbus
 
 	_UPOWER_BUS = 'org.freedesktop.UPower'
 	_UPOWER_INTERFACE = 'org.freedesktop.UPower'