Skip to content

Commit f5c5780

Browse files
authored
Merge pull request #9 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents 80b38c0 + 5af61d0 commit f5c5780

File tree

4 files changed

+92
-68
lines changed

4 files changed

+92
-68
lines changed

.github/workflows/build.yml

+1-1
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 --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
4444
- name: Library version
4545
run: git describe --dirty --always --tags
4646
- name: PyLint

adafruit_logging.py

+20-14
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,28 @@
4040
https://github.com/adafruit/circuitpython/releases
4141
4242
"""
43-
#pylint:disable=redefined-outer-name,consider-using-enumerate,no-self-use
44-
#pylint:disable=invalid-name
43+
# pylint:disable=redefined-outer-name,consider-using-enumerate,no-self-use
44+
# pylint:disable=invalid-name
4545

4646
import time
4747

4848
__version__ = "0.0.0-auto.0"
4949
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Logger.git"
5050

5151

52-
LEVELS = [(00, 'NOTSET'),
53-
(10, 'DEBUG'),
54-
(20, 'INFO'),
55-
(30, 'WARNING'),
56-
(40, 'ERROR'),
57-
(50, 'CRITICAL')]
52+
LEVELS = [
53+
(00, "NOTSET"),
54+
(10, "DEBUG"),
55+
(20, "INFO"),
56+
(30, "WARNING"),
57+
(40, "ERROR"),
58+
(50, "CRITICAL"),
59+
]
5860

5961
for value, name in LEVELS:
6062
globals()[name] = value
6163

64+
6265
def level_for(value):
6366
"""Convert a numberic level to the most appropriate name.
6467
@@ -68,11 +71,12 @@ def level_for(value):
6871
for i in range(len(LEVELS)):
6972
if value == LEVELS[i][0]:
7073
return LEVELS[i][1]
71-
elif value < LEVELS[i][0]:
72-
return LEVELS[i-1][1]
74+
if value < LEVELS[i][0]:
75+
return LEVELS[i - 1][1]
7376
return LEVELS[0][1]
7477

75-
class LoggingHandler(object):
78+
79+
class LoggingHandler():
7680
"""Abstract logging message handler."""
7781

7882
def format(self, level, msg):
@@ -82,7 +86,7 @@ def format(self, level, msg):
8286
:param msg: the message to log
8387
8488
"""
85-
return '{0}: {1} - {2}'.format(time.monotonic(), level_for(level), msg)
89+
return "{0}: {1} - {2}".format(time.monotonic(), level_for(level), msg)
8690

8791
def emit(self, level, msg):
8892
"""Send a message where it should go.
@@ -105,10 +109,11 @@ def emit(self, level, msg):
105109

106110

107111
# The level module-global variables get created when loaded
108-
#pylint:disable=undefined-variable
112+
# pylint:disable=undefined-variable
109113

110114
logger_cache = dict()
111115

116+
112117
def getLogger(name):
113118
"""Create or retrieve a logger by name.
114119
@@ -119,7 +124,8 @@ def getLogger(name):
119124
logger_cache[name] = Logger()
120125
return logger_cache[name]
121126

122-
class Logger(object):
127+
128+
class Logger():
123129
"""Provide a logging api."""
124130

125131
def __init__(self):

docs/conf.py

+66-48
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,54 @@
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!
2021
# Uncomment the below if you use native CircuitPython modules such as
2122
# digitalio, micropython and busio. List the modules you use. Without it, the
2223
# autodoc module docs will fail to generate with a warning.
23-
#autodoc_mock_imports = ["digitalio", "busio"]
24+
# autodoc_mock_imports = ["digitalio", "busio"]
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 Logger Library'
38-
copyright = u'2019 Dave Astels'
39-
author = u'Dave Astels'
41+
project = "Adafruit Logger Library"
42+
copyright = "2019 Dave Astels"
43+
author = "Dave Astels"
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 = 'AdafruitLoggerLibrarydoc'
117+
htmlhelp_basename = "AdafruitLoggerLibrarydoc"
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, 'AdafruitLoggerLibrary.tex', u'AdafruitLogger Library Documentation',
139-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitLoggerLibrary.tex",
143+
"AdafruitLogger 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, 'AdafruitLoggerlibrary', u'Adafruit Logger Library Documentation',
148-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitLoggerlibrary",
157+
"Adafruit Logger 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, 'AdafruitLoggerLibrary', u'Adafruit Logger Library Documentation',
158-
author, 'AdafruitLoggerLibrary', 'One line description of project.',
159-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitLoggerLibrary",
172+
"Adafruit Logger Library Documentation",
173+
author,
174+
"AdafruitLoggerLibrary",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
160178
]

examples/logging_simpletest.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#pylint:disable=undefined-variable,wildcard-import,no-name-in-module
2-
#pylint:disable=no-member
1+
# pylint:disable=undefined-variable,wildcard-import,no-name-in-module
2+
# pylint:disable=no-member
33

44
import adafruit_logging as logging
55

6-
logger = logging.getLogger('test')
6+
logger = logging.getLogger("test")
77

88
logger.setLevel(logging.ERROR)
9-
logger.info('Info message')
10-
logger.error('Error message')
9+
logger.info("Info message")
10+
logger.error("Error message")

0 commit comments

Comments
 (0)