Skip to content

Commit 7af47da

Browse files
authored
Merge pull request #8 from adafruit/pylint-update
Pylint update
2 parents 70c79ab + 49cf2f7 commit 7af47da

File tree

6 files changed

+168
-123
lines changed

6 files changed

+168
-123
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
source actions-ci/install.sh
4141
- name: Pip install pylint, black, & Sphinx
4242
run: |
43-
pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
43+
pip install pylint black==19.10b0 Sphinx sphinx-rtd-theme
4444
- name: Library version
4545
run: git describe --dirty --always --tags
4646
- name: PyLint

adafruit_aws_iot.py

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@
4949

5050
class AWS_IOT_ERROR(Exception):
5151
"""Exception raised on MQTT API return-code errors."""
52+
5253
# pylint: disable=unnecessary-pass
5354
pass
5455

56+
5557
class MQTT_CLIENT:
5658
"""Client for interacting with Amazon AWS IoT MQTT API.
5759
@@ -60,24 +62,33 @@ class MQTT_CLIENT:
6062
Provided interval must be 30 <= keep_alive <= 1200.
6163
6264
"""
65+
6366
def __init__(self, mmqttclient, keep_alive=30):
6467
if "MQTT" in str(type(mmqttclient)):
6568
self.client = mmqttclient
6669
else:
67-
raise TypeError("This class requires a preconfigured MiniMQTT object, \
68-
please create one.")
70+
raise TypeError(
71+
"This class requires a preconfigured MiniMQTT object, \
72+
please create one."
73+
)
6974
# Verify MiniMQTT client object configuration
7075
try:
7176
self.cid = self.client.client_id
72-
assert self.cid[0] != "$", "Client ID can not start with restricted client ID prefix $."
77+
assert (
78+
self.cid[0] != "$"
79+
), "Client ID can not start with restricted client ID prefix $."
7380
except:
74-
raise TypeError("You must provide MiniMQTT with your AWS IoT Device's Identifier \
75-
as the Client ID.")
81+
raise TypeError(
82+
"You must provide MiniMQTT with your AWS IoT Device's Identifier \
83+
as the Client ID."
84+
)
7685
# Shadow-interaction topic
7786
self.shadow_topic = "$aws/things/{}/shadow".format(self.cid)
7887
# keep_alive timer must be between 30 <= keep alive interval <= 1200 seconds
7988
# https://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html
80-
assert 30 <= keep_alive <= 1200, "Keep_Alive timer \
89+
assert (
90+
30 <= keep_alive <= 1200
91+
), "Keep_Alive timer \
8192
interval must be between 30 and 1200 seconds"
8293
self.keep_alive = keep_alive
8394
# User-defined MQTT callback methods must be init'd to None
@@ -100,7 +111,6 @@ def __enter__(self):
100111
def __exit__(self, exception_type, exception_value, traceback):
101112
self.disconnect()
102113

103-
104114
@property
105115
def is_connected(self):
106116
"""Returns if MQTT_CLIENT is connected to AWS IoT MQTT Broker
@@ -115,7 +125,7 @@ def disconnect(self):
115125
try:
116126
self.client.disconnect()
117127
except MMQTTException as error:
118-
raise AWS_IOT_ERROR('Error disconnecting with AWS IoT: ', error)
128+
raise AWS_IOT_ERROR("Error disconnecting with AWS IoT: ", error)
119129
self.connected_to_aws = False
120130
# Reset user-defined callback methods to None
121131
self.on_connect = None
@@ -133,7 +143,7 @@ def connect(self, clean_session=True):
133143
try:
134144
self.client.connect(clean_session)
135145
except MMQTTException as error:
136-
raise AWS_IOT_ERROR('Error connecting to AWS IoT: ', error)
146+
raise AWS_IOT_ERROR("Error connecting to AWS IoT: ", error)
137147
self.connected_to_aws = True
138148

139149
# MiniMQTT Callback Handlers
@@ -265,30 +275,34 @@ def shadow_get_subscribe(self, qos=1):
265275
:param int qos: Optional quality of service level.
266276
267277
"""
268-
self.client.subscribe(self.shadow_topic+"/get/#", qos)
278+
self.client.subscribe(self.shadow_topic + "/get/#", qos)
269279

270280
def shadow_subscribe(self, qos=1):
271281
"""Subscribes to all notifications on the device's shadow update topic.
272282
:param int qos: Optional quality of service level.
273283
274284
"""
275-
self.client.subscribe(self.shadow_topic+"/update/#", qos)
285+
self.client.subscribe(self.shadow_topic + "/update/#", qos)
276286

277287
def shadow_update(self, document):
278288
"""Publishes a request state document to update the device's shadow.
279289
:param json state_document: JSON-formatted state document.
280290
281291
"""
282-
self.client.publish(self.shadow_topic+"/update", document)
292+
self.client.publish(self.shadow_topic + "/update", document)
283293

284294
def shadow_get(self):
285295
"""Publishes an empty message to shadow get topic to get the device's shadow.
286296
287297
"""
288-
self.client.publish(self.shadow_topic+"/get", json.dumps({"message": "ignore"}))
298+
self.client.publish(
299+
self.shadow_topic + "/get", json.dumps({"message": "ignore"})
300+
)
289301

290302
def shadow_delete(self):
291303
"""Publishes an empty message to the shadow delete topic to delete a device's shadow
292304
293305
"""
294-
self.client.publish(self.shadow_topic+"/delete", json.dumps({"message": "delete"}))
306+
self.client.publish(
307+
self.shadow_topic + "/delete", json.dumps({"message": "delete"})
308+
)

docs/conf.py

Lines changed: 65 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22

33
import os
44
import sys
5-
sys.path.insert(0, os.path.abspath('..'))
5+
6+
sys.path.insert(0, os.path.abspath(".."))
67

78
# -- General configuration ------------------------------------------------
89

910
# Add any Sphinx extension module names here, as strings. They can be
1011
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
1112
# ones.
1213
extensions = [
13-
'sphinx.ext.autodoc',
14-
'sphinx.ext.intersphinx',
15-
'sphinx.ext.napoleon',
16-
'sphinx.ext.todo',
14+
"sphinx.ext.autodoc",
15+
"sphinx.ext.intersphinx",
16+
"sphinx.ext.napoleon",
17+
"sphinx.ext.todo",
1718
]
1819

1920
# TODO: Please Read!
@@ -23,29 +24,32 @@
2324
autodoc_mock_imports = ["adafruit_minimqtt"]
2425

2526

26-
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
27+
intersphinx_mapping = {
28+
"python": ("https://docs.python.org/3.4", None),
29+
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
30+
}
2731

2832
# Add any paths that contain templates here, relative to this directory.
29-
templates_path = ['_templates']
33+
templates_path = ["_templates"]
3034

31-
source_suffix = '.rst'
35+
source_suffix = ".rst"
3236

3337
# The master toctree document.
34-
master_doc = 'index'
38+
master_doc = "index"
3539

3640
# General information about the project.
37-
project = u'Adafruit AWS_IOT Library'
38-
copyright = u'2019 Brent Rubell'
39-
author = u'Brent Rubell'
41+
project = "Adafruit AWS_IOT Library"
42+
copyright = "2019 Brent Rubell"
43+
author = "Brent Rubell"
4044

4145
# The version info for the project you're documenting, acts as replacement for
4246
# |version| and |release|, also used in various other places throughout the
4347
# built documents.
4448
#
4549
# The short X.Y version.
46-
version = u'1.0'
50+
version = "1.0"
4751
# The full version, including alpha/beta/rc tags.
48-
release = u'1.0'
52+
release = "1.0"
4953

5054
# The language for content autogenerated by Sphinx. Refer to documentation
5155
# for a list of supported languages.
@@ -57,7 +61,7 @@
5761
# List of patterns, relative to source directory, that match files and
5862
# directories to ignore when looking for source files.
5963
# This patterns also effect to html_static_path and html_extra_path
60-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.env', 'CODE_OF_CONDUCT.md']
64+
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".env", "CODE_OF_CONDUCT.md"]
6165

6266
# The reST default role (used for this markup: `text`) to use for all
6367
# documents.
@@ -69,7 +73,7 @@
6973
add_function_parentheses = True
7074

7175
# The name of the Pygments (syntax highlighting) style to use.
72-
pygments_style = 'sphinx'
76+
pygments_style = "sphinx"
7377

7478
# If true, `todo` and `todoList` produce output, else they produce nothing.
7579
todo_include_todos = False
@@ -84,68 +88,76 @@
8488
# The theme to use for HTML and HTML Help pages. See the documentation for
8589
# a list of builtin themes.
8690
#
87-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
91+
on_rtd = os.environ.get("READTHEDOCS", None) == "True"
8892

8993
if not on_rtd: # only import and set the theme if we're building docs locally
9094
try:
9195
import sphinx_rtd_theme
92-
html_theme = 'sphinx_rtd_theme'
93-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']
96+
97+
html_theme = "sphinx_rtd_theme"
98+
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
9499
except:
95-
html_theme = 'default'
96-
html_theme_path = ['.']
100+
html_theme = "default"
101+
html_theme_path = ["."]
97102
else:
98-
html_theme_path = ['.']
103+
html_theme_path = ["."]
99104

100105
# Add any paths that contain custom static files (such as style sheets) here,
101106
# relative to this directory. They are copied after the builtin static files,
102107
# so a file named "default.css" will overwrite the builtin "default.css".
103-
html_static_path = ['_static']
108+
html_static_path = ["_static"]
104109

105110
# The name of an image file (relative to this directory) to use as a favicon of
106111
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
107112
# pixels large.
108113
#
109-
html_favicon = '_static/favicon.ico'
114+
html_favicon = "_static/favicon.ico"
110115

111116
# Output file base name for HTML help builder.
112-
htmlhelp_basename = 'AdafruitAws_iotLibrarydoc'
117+
htmlhelp_basename = "AdafruitAws_iotLibrarydoc"
113118

114119
# -- Options for LaTeX output ---------------------------------------------
115120

116121
latex_elements = {
117-
# The paper size ('letterpaper' or 'a4paper').
118-
#
119-
# 'papersize': 'letterpaper',
120-
121-
# The font size ('10pt', '11pt' or '12pt').
122-
#
123-
# 'pointsize': '10pt',
124-
125-
# Additional stuff for the LaTeX preamble.
126-
#
127-
# 'preamble': '',
128-
129-
# Latex figure (float) alignment
130-
#
131-
# 'figure_align': 'htbp',
122+
# The paper size ('letterpaper' or 'a4paper').
123+
#
124+
# 'papersize': 'letterpaper',
125+
# The font size ('10pt', '11pt' or '12pt').
126+
#
127+
# 'pointsize': '10pt',
128+
# Additional stuff for the LaTeX preamble.
129+
#
130+
# 'preamble': '',
131+
# Latex figure (float) alignment
132+
#
133+
# 'figure_align': 'htbp',
132134
}
133135

134136
# Grouping the document tree into LaTeX files. List of tuples
135137
# (source start file, target name, title,
136138
# author, documentclass [howto, manual, or own class]).
137139
latex_documents = [
138-
(master_doc, 'AdafruitAWS_IOTLibrary.tex', u'AdafruitAWS_IOT Library Documentation',
139-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitAWS_IOTLibrary.tex",
143+
"AdafruitAWS_IOT Library Documentation",
144+
author,
145+
"manual",
146+
),
140147
]
141148

142149
# -- Options for manual page output ---------------------------------------
143150

144151
# One entry per manual page. List of tuples
145152
# (source start file, name, description, authors, manual section).
146153
man_pages = [
147-
(master_doc, 'AdafruitAWS_IOTlibrary', u'Adafruit AWS_IOT Library Documentation',
148-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitAWS_IOTlibrary",
157+
"Adafruit AWS_IOT Library Documentation",
158+
[author],
159+
1,
160+
)
149161
]
150162

151163
# -- Options for Texinfo output -------------------------------------------
@@ -154,7 +166,13 @@
154166
# (source start file, target name, title, author,
155167
# dir menu entry, description, category)
156168
texinfo_documents = [
157-
(master_doc, 'AdafruitAWS_IOTLibrary', u'Adafruit AWS_IOT Library Documentation',
158-
author, 'AdafruitAWS_IOTLibrary', 'One line description of project.',
159-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitAWS_IOTLibrary",
172+
"Adafruit AWS_IOT Library Documentation",
173+
author,
174+
"AdafruitAWS_IOTLibrary",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
160178
]

0 commit comments

Comments
 (0)