From 018e248b65aed4e8dc675a7b5abde6313a518b34 Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:14:02 +0300 Subject: [PATCH 01/10] chore: add pylintrc --- .pylintrc | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 .pylintrc diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..c150ed3 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,661 @@ +[MAIN] + +# Analyse import fallback blocks. This can be used to support both Python 2 and +# 3 compatible code, which means that the block might have code that exists +# only in one or another interpreter, leading to false positives when analysed. +analyse-fallback-blocks=no + +# Clear in-memory caches upon conclusion of linting. Useful if running pylint +# in a server-like mode. +clear-cache-post-run=no + +# Load and enable all available extensions. Use --list-extensions to see a list +# all available extensions. +#enable-all-extensions= + +# In error mode, messages with a category besides ERROR or FATAL are +# suppressed, and no reports are done by default. Error mode is compatible with +# disabling specific errors. +#errors-only= + +# Always return a 0 (non-error) status code, even if lint errors are found. +# This is primarily useful in continuous integration scripts. +#exit-zero= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. +extension-pkg-allow-list= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. (This is an alternative name to extension-pkg-allow-list +# for backward compatibility.) +extension-pkg-whitelist= + +# Return non-zero exit code if any of these messages/categories are detected, +# even if score is above --fail-under value. Syntax same as enable. Messages +# specified are enabled, while categories only check already-enabled messages. +fail-on= + +# Specify a score threshold under which the program will exit with error. +fail-under=10 + +# Interpret the stdin as a python script, whose filename needs to be passed as +# the module_or_package argument. +#from-stdin= + +# Files or directories to be skipped. They should be base names, not paths. +ignore=CVS + +# Add files or directories matching the regular expressions patterns to the +# ignore-list. The regex matches against paths and can be in Posix or Windows +# format. Because '\\' represents the directory delimiter on Windows systems, +# it can't be used as an escape character. +ignore-paths= + +# Files or directories matching the regular expression patterns are skipped. +# The regex matches against base names, not paths. The default value ignores +# Emacs file locks +ignore-patterns=^\.# + +# List of module names for which member attributes should not be checked +# (useful for modules/projects where namespaces are manipulated during runtime +# and thus existing member attributes cannot be deduced by static analysis). It +# supports qualified module names, as well as Unix pattern matching. +ignored-modules= + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= + +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use, and will cap the count on Windows to +# avoid hangs. +jobs=1 + +# Control the amount of potential inferred values when inferring a single +# object. This can help the performance when dealing with large functions or +# complex, nested conditions. +limit-inference-results=100 + +# List of plugins (as comma separated values of python module names) to load, +# usually to register additional checkers. +load-plugins= + +# Pickle collected data for later comparisons. +persistent=yes + +# Minimum Python version to use for version dependent checks. Will default to +# the version used to run pylint. +py-version=3.8 + +# Discover python modules and packages in the file system subtree. +recursive=no + +# Add paths to the list of the source roots. Supports globbing patterns. The +# source root is an absolute path or a path relative to the current working +# directory used to determine a package namespace for modules located under the +# source root. +source-roots= + +# When enabled, pylint would attempt to guess common misconfiguration and emit +# user-friendly hints instead of false-positive error messages. +suggestion-mode=yes + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + +# In verbose mode, extra non-checker-related info will be displayed. +#verbose= + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. If left empty, argument names will be checked with the set +# naming style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. If left empty, attribute names will be checked with the set naming +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. If left empty, class attribute names will be checked +# with the set naming style. +#class-attribute-rgx= + +# Naming style matching correct class constant names. +class-const-naming-style=UPPER_CASE + +# Regular expression matching correct class constant names. Overrides class- +# const-naming-style. If left empty, class constant names will be checked with +# the set naming style. +#class-const-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. If left empty, class names will be checked with the set naming style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. If left empty, constant names will be checked with the set naming +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. If left empty, function names will be checked with the set +# naming style. +#function-rgx= + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ + +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. If left empty, inline iteration names will be checked +# with the set naming style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. If left empty, method names will be checked with the set naming style. +#method-rgx= + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. If left empty, module names will be checked with the set naming style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Regular expression matching correct type alias names. If left empty, type +# alias names will be checked with the set naming style. +#typealias-rgx= + +# Regular expression matching correct type variable names. If left empty, type +# variable names will be checked with the set naming style. +#typevar-rgx= + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. If left empty, variable names will be checked with the set +# naming style. +#variable-rgx= + + +[CLASSES] + +# Warn about protected attribute access inside special methods +check-protected-access-in-special-methods=no + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp, + asyncSetUp, + __post_init__ + +# List of member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict,_fields,_replace,_source,_make,os._exit + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=mcs + + +[DESIGN] + +# List of regular expressions of class ancestor names to ignore when counting +# public methods (see R0903) +exclude-too-few-public-methods= + +# List of qualified class names to ignore when counting class parents (see +# R0901) +ignored-parents= + +# Maximum number of arguments for function / method. +max-args=5 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement (see R0916). +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when caught. +overgeneral-exceptions=builtins.BaseException,builtins.Exception + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=100 + +# Maximum number of lines in a module. +max-module-lines=1000 + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[IMPORTS] + +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= + +# Allow explicit reexports by alias from a package __init__. +allow-reexport-from-package=no + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules= + +# Output a graph (.gv or any supported image format) of external dependencies +# to the given file (report RP0402 must not be disabled). +ext-import-graph= + +# Output a graph (.gv or any supported image format) of all (i.e. internal and +# external) dependencies to the given file (report RP0402 must not be +# disabled). +import-graph= + +# Output a graph (.gv or any supported image format) of internal dependencies +# to the given file (report RP0402 must not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[LOGGING] + +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, +# UNDEFINED. +confidence=HIGH, + CONTROL_FLOW, + INFERENCE, + INFERENCE_FAILURE, + UNDEFINED + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then re-enable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +disable=raw-checker-failed, + bad-inline-option, + locally-disabled, + file-ignored, + suppressed-message, + useless-suppression, + deprecated-pragma, + use-symbolic-message-instead, + line-too-long, + too-many-lines, + fixme, + unused-argument, + invalid-name, + no-else-return, + consider-using-f-string, + unnecessary-lambda-assignment, + consider-using-in, + dangerous-default-value, + unidiomatic-typecheck, + too-many-return-statements, + too-many-arguments, + nested-min-max, + unused-variable, + too-many-locals, + use-implicit-booleaness-not-len, + too-many-branches, + unspecified-encoding, + import-outside-toplevel, + reimported, + redefined-outer-name, + too-many-nested-blocks, + too-many-branches, + too-many-boolean-expressions, + unnecessary-comprehension, + no-else-break, + too-many-statements, + comparison-with-callable + + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +enable=c-extension-no-member + + +[METHOD_ARGS] + +# List of qualified names (i.e., library.method) which require a timeout +# parameter e.g. 'requests.api.get,requests.api.post' +timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO + +# Regular expression of note tags to take in consideration. +notes-rgx= + + +[REFACTORING] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit,argparse.parse_error + + +[REPORTS] + +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'fatal', 'error', 'warning', 'refactor', +# 'convention', and 'info' which contain the number of messages in each +# category, as well as 'statement' which is the total number of statements +# analyzed. This score is used by the global evaluation report (RP0004). +evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +msg-template= + +# Set the output format. Available formats are text, parseable, colorized, json +# and msvs (visual studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +#output-format= + +# Tells whether to display a full report or only the messages. +reports=no + +# Activate the evaluation score. +score=yes + + +[SIMILARITIES] + +# Comments are removed from the similarity computation +ignore-comments=yes + +# Docstrings are removed from the similarity computation +ignore-docstrings=yes + +# Imports are removed from the similarity computation +ignore-imports=yes + +# Signatures are removed from the similarity computation +ignore-signatures=yes + +# Minimum lines number of a similarity. +min-similarity-lines=4 + + +[SPELLING] + +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 + +# Spelling dictionary name. No available dictionaries : You need to install +# both the python package and the system dependency for enchant to work.. +spelling-dict= + +# List of comma separated words that should be considered directives if they +# appear at the beginning of a comment and should not be checked. +spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy: + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains the private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to the private dictionary (see the +# --spelling-private-dict-file option) instead of raising a message. +spelling-store-unknown-words=no + + +[STRING] + +# This flag controls whether inconsistent-quotes generates a warning when the +# character used as a quote delimiter is used inconsistently within a module. +check-quote-consistency=no + +# This flag controls whether the implicit-str-concat should generate a warning +# on implicit string concatenation in sequences defined over several lines. +check-str-concat-over-line-jumps=no + + +[TYPECHECK] + +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of symbolic message names to ignore for Mixin members. +ignored-checks-for-mixins=no-member, + not-async-context-manager, + not-context-manager, + attribute-defined-outside-init + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace + +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes + +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + +# Regex pattern to define which classes are considered mixins. +mixin-class-rgx=.*[Mm]ixin + +# List of decorators that change the signature of a decorated function. +signature-mutators= + + +[VARIABLES] + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= + +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes + +# List of names allowed to shadow builtins +allowed-redefined-builtins= + +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb + +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ + +# Argument names that match this expression will be ignored. +ignored-argument-names=_.*|^ignored_|^unused_ + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io From b0e222f70463d475ded7a42c52c072ec4e2d618a Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:16:01 +0300 Subject: [PATCH 02/10] chore: add pylint workflow --- .github/workflows/pylint.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/pylint.yaml diff --git a/.github/workflows/pylint.yaml b/.github/workflows/pylint.yaml new file mode 100644 index 0000000..7617b94 --- /dev/null +++ b/.github/workflows/pylint.yaml @@ -0,0 +1,24 @@ +name: Pylint + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pylint + - name: Analysing the code with pylint + run: | + pylint tabulate/*.py + From 84a2354f17b64cf0fc287042d5089cf1f0bad398 Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:24:23 +0300 Subject: [PATCH 03/10] fix: pylint no-else-break --- .pylintrc | 1 - tabulate/__init__.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pylintrc b/.pylintrc index c150ed3..64ff114 100644 --- a/.pylintrc +++ b/.pylintrc @@ -455,7 +455,6 @@ disable=raw-checker-failed, too-many-branches, too-many-boolean-expressions, unnecessary-comprehension, - no-else-break, too-many-statements, comparison-with-callable diff --git a/tabulate/__init__.py b/tabulate/__init__.py index 11bb865..729abc7 100644 --- a/tabulate/__init__.py +++ b/tabulate/__init__.py @@ -2214,7 +2214,7 @@ def tabulate( for idx, align in enumerate(colalign): if not idx < len(aligns): break - elif align != "global": + if align != "global": aligns[idx] = align minwidths = ( [width_fn(h) + min_padding for h in headers] if headers else [0] * len(cols) @@ -2242,7 +2242,7 @@ def tabulate( hidx = headers_pad + idx if not hidx < len(aligns_headers): break - elif align == "same" and hidx < len(aligns): # same as column align + if align == "same" and hidx < len(aligns): # same as column align aligns_headers[hidx] = aligns[hidx] elif align != "global": aligns_headers[hidx] = align From 032a0b83a4ee5650d52124be5c1c259bdc20381c Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:28:50 +0300 Subject: [PATCH 04/10] fix: pylint comparison-with-callable --- .pylintrc | 3 +-- tabulate/__init__.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pylintrc b/.pylintrc index 64ff114..cce5b69 100644 --- a/.pylintrc +++ b/.pylintrc @@ -455,8 +455,7 @@ disable=raw-checker-failed, too-many-branches, too-many-boolean-expressions, unnecessary-comprehension, - too-many-statements, - comparison-with-callable + too-many-statements # Enable the message, report, category or checker with the given id(s). You can diff --git a/tabulate/__init__.py b/tabulate/__init__.py index 729abc7..b4fe68a 100644 --- a/tabulate/__init__.py +++ b/tabulate/__init__.py @@ -2461,7 +2461,7 @@ def _format_table(fmt, headers, headersaligns, rows, colwidths, colaligns, is_mu if headers or rows: output = "\n".join(lines) - if fmt.lineabove == _html_begin_table_without_header: + if fmt.lineabove == _html_begin_table_without_header: # pylint: disable=comparison-with-callable return JupyterHTMLStr(output) else: return output From 8f950aa096a81443cc6c46af8843c8cc9bc7ac3f Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:30:49 +0300 Subject: [PATCH 05/10] fix: pylint unnecessary-comprehension --- .pylintrc | 1 - tabulate/__init__.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.pylintrc b/.pylintrc index cce5b69..3928795 100644 --- a/.pylintrc +++ b/.pylintrc @@ -454,7 +454,6 @@ disable=raw-checker-failed, too-many-nested-blocks, too-many-branches, too-many-boolean-expressions, - unnecessary-comprehension, too-many-statements diff --git a/tabulate/__init__.py b/tabulate/__init__.py index b4fe68a..ff07f49 100644 --- a/tabulate/__init__.py +++ b/tabulate/__init__.py @@ -2210,7 +2210,7 @@ def tabulate( if colalign is not None: assert isinstance(colalign, Iterable) if isinstance(colalign, str): - warnings.warn(f"As a string, `colalign` is interpreted as {[c for c in colalign]}. Did you mean `colglobalalign = \"{colalign}\"` or `colalign = (\"{colalign}\",)`?", stacklevel=2) + warnings.warn(f"As a string, `colalign` is interpreted as {list(colalign)}. Did you mean `colglobalalign = \"{colalign}\"` or `colalign = (\"{colalign}\",)`?", stacklevel=2) for idx, align in enumerate(colalign): if not idx < len(aligns): break @@ -2237,7 +2237,7 @@ def tabulate( if headersalign is not None: assert isinstance(headersalign, Iterable) if isinstance(headersalign, str): - warnings.warn(f"As a string, `headersalign` is interpreted as {[c for c in headersalign]}. Did you mean `headersglobalalign = \"{headersalign}\"` or `headersalign = (\"{headersalign}\",)`?", stacklevel=2) + warnings.warn(f"As a string, `headersalign` is interpreted as {list(headersalign)}. Did you mean `headersglobalalign = \"{headersalign}\"` or `headersalign = (\"{headersalign}\",)`?", stacklevel=2) for idx, align in enumerate(headersalign): hidx = headers_pad + idx if not hidx < len(aligns_headers): @@ -2498,7 +2498,7 @@ def _update_lines(self, lines, new_line): as add any colors from previous lines order to preserve the same formatting as a single unwrapped string. """ - code_matches = [x for x in _ansi_codes.finditer(new_line)] + code_matches = list(_ansi_codes.finditer(new_line)) color_codes = [ code.string[code.span()[0] : code.span()[1]] for code in code_matches ] From 909ab6f37aad57d7c79f5e2e82b5f02fe67b7aab Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:32:22 +0300 Subject: [PATCH 06/10] fix: pylint unused-variable --- .pylintrc | 1 - tabulate/__init__.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pylintrc b/.pylintrc index 3928795..9914e94 100644 --- a/.pylintrc +++ b/.pylintrc @@ -443,7 +443,6 @@ disable=raw-checker-failed, too-many-return-statements, too-many-arguments, nested-min-max, - unused-variable, too-many-locals, use-implicit-booleaness-not-len, too-many-branches, diff --git a/tabulate/__init__.py b/tabulate/__init__.py index ff07f49..65a34c6 100644 --- a/tabulate/__init__.py +++ b/tabulate/__init__.py @@ -1353,9 +1353,9 @@ def _normalize_tabular_data(tabular_data, headers, showindex="default"): try: bool(headers) - is_headers2bool_broken = False # noqa + is_headers2bool_broken = False # noqa, pylint: disable=unused-variable except ValueError: # numpy.ndarray, pandas.core.index.Index, ... - is_headers2bool_broken = True # noqa + is_headers2bool_broken = True # noqa, pylint: disable=unused-variable headers = list(headers) index = None From 7cc42cfc66afbe139fb552a672cb893a8203d195 Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:38:46 +0300 Subject: [PATCH 07/10] fix: pylint no-else-return --- .pylintrc | 1 - tabulate/__init__.py | 119 +++++++++++++++++-------------------------- 2 files changed, 48 insertions(+), 72 deletions(-) diff --git a/.pylintrc b/.pylintrc index 9914e94..55cf8dd 100644 --- a/.pylintrc +++ b/.pylintrc @@ -434,7 +434,6 @@ disable=raw-checker-failed, fixme, unused-argument, invalid-name, - no-else-return, consider-using-f-string, unnecessary-lambda-assignment, consider-using-in, diff --git a/tabulate/__init__.py b/tabulate/__init__.py index 65a34c6..951184f 100644 --- a/tabulate/__init__.py +++ b/tabulate/__init__.py @@ -117,12 +117,11 @@ def _pipe_segment_with_colons(align, colwidth): w = colwidth if align in ["right", "decimal"]: return ("-" * (w - 1)) + ":" - elif align == "center": + if align == "center": return ":" + ("-" * (w - 2)) + ":" - elif align == "left": + if align == "left": return ":" + ("-" * (w - 1)) - else: - return "-" * w + return "-" * w def _pipe_line_with_colons(colwidths, colaligns): @@ -246,7 +245,7 @@ def make_header_line(is_header, colwidths, colaligns): # print the table header with column widths and optional header tag return make_header_line(False, *args) - elif len(args) == 3: + if len(args) == 3: # three arguments are passed if called in the context of dataline or headerline # print the table line and make the aboveline if it is a header @@ -255,14 +254,12 @@ def make_header_line(is_header, colwidths, colaligns): if is_header: return make_header_line(True, colwidths, colaligns) + "\n" + data_line - else: - return data_line + return data_line - else: - raise ValueError( - " _asciidoc_row() requires two (colwidths, colaligns) " - + "or three (cell_values, colwidths, colaligns) arguments) " - ) + raise ValueError( + " _asciidoc_row() requires two (colwidths, colaligns) " + + "or three (cell_values, colwidths, colaligns) arguments) " + ) LATEX_ESCAPE_RULES = { @@ -294,8 +291,7 @@ def _rst_escape_first_column(rows, headers): def escape_empty(val): if isinstance(val, (str, bytes)) and not val.strip(): return ".." - else: - return val + return val new_headers = list(headers) new_rows = [] @@ -853,7 +849,7 @@ def _isnumber(string): """ if not _isconvertible(float, string): return False - elif isinstance(string, (str, bytes)) and ( + if isinstance(string, (str, bytes)) and ( math.isinf(float(string)) or math.isnan(float(string)) ): return string.lower() in ["inf", "-inf", "nan"] @@ -914,18 +910,17 @@ def _type(string, has_invisible=True, numparse=True): if string is None: return type(None) - elif hasattr(string, "isoformat"): # datetime.datetime, date, and time + if hasattr(string, "isoformat"): # datetime.datetime, date, and time return str - elif _isbool(string): + if _isbool(string): return bool - elif _isint(string) and numparse: + if _isint(string) and numparse: return int - elif _isnumber(string) and numparse: + if _isnumber(string) and numparse: return float - elif isinstance(string, bytes): + if isinstance(string, bytes): return bytes - else: - return str + return str def _afterpoint(string): @@ -946,15 +941,12 @@ def _afterpoint(string): if _isnumber(string) or _isnumber_with_thousands_separator(string): if _isint(string): return -1 - else: - pos = string.rfind(".") - pos = string.lower().rfind("e") if pos < 0 else pos - if pos >= 0: - return len(string) - pos - 1 - else: - return -1 # no point - else: - return -1 # not a number + pos = string.rfind(".") + pos = string.lower().rfind("e") if pos < 0 else pos + if pos >= 0: + return len(string) - pos - 1 + return -1 # no point + return -1 # not a number def _padleft(width, s): @@ -1010,8 +1002,7 @@ def _strip_ansi(s): """ if isinstance(s, str): return _ansi_codes.sub(r"\4", s) - else: # a bytestring - return _ansi_codes_bytes.sub(r"\4", s) + return _ansi_codes_bytes.sub(r"\4", s) def _visible_width(s): @@ -1028,15 +1019,13 @@ def _visible_width(s): len_fn = len if isinstance(s, (str, bytes)): return len_fn(_strip_ansi(s)) - else: - return len_fn(str(s)) + return len_fn(str(s)) def _is_multiline(s): if isinstance(s, str): return bool(re.search(_multiline_codes, s)) - else: # a bytestring - return bool(re.search(_multiline_codes_bytes, s)) + return bool(re.search(_multiline_codes_bytes, s)) def _multiline_width(multiline_s, line_width_fn=len): @@ -1228,23 +1217,21 @@ def _format(val, valtype, floatfmt, intfmt, missingval="", has_invisible=True): if valtype is str: return f"{val}" - elif valtype is int: + if valtype is int: return format(val, intfmt) - elif valtype is bytes: + if valtype is bytes: try: return str(val, "ascii") except (TypeError, UnicodeDecodeError): return str(val) - elif valtype is float: + if valtype is float: is_a_colored_number = has_invisible and isinstance(val, (str, bytes)) if is_a_colored_number: raw_val = _strip_ansi(val) formatted_val = format(float(raw_val), floatfmt) return val.replace(raw_val, formatted_val) - else: - return format(float(val), floatfmt) - else: - return f"{val}" + return format(float(val), floatfmt) + return f"{val}" def _align_header( @@ -1262,12 +1249,11 @@ def _align_header( width += ninvisible if alignment == "left": return _padright(width, header) - elif alignment == "center": + if alignment == "center": return _padboth(width, header) - elif not alignment: + if not alignment: return f"{header}" - else: - return _padleft(width, header) + return _padleft(width, header) def _remove_separating_lines(rows): @@ -1280,8 +1266,7 @@ def _remove_separating_lines(rows): else: sans_rows.append(row) return sans_rows, separating_lines - else: - return rows, None + return rows, None def _reinsert_separating_lines(rows, separating_lines): @@ -2284,8 +2269,7 @@ def _expand_numparse(disable_numparse, column_count): for index in disable_numparse: numparses[index] = False return numparses - else: - return [not disable_numparse] * column_count + return [not disable_numparse] * column_count def _expand_iterable(original, num_desired, default): @@ -2298,8 +2282,7 @@ def _expand_iterable(original, num_desired, default): """ if isinstance(original, Iterable) and not isinstance(original, str): return original + [default] * (num_desired - len(original)) - else: - return [default] * num_desired + return [default] * num_desired def _pad_row(cells, padding): @@ -2307,8 +2290,7 @@ def _pad_row(cells, padding): pad = " " * padding padded_cells = [pad + cell + pad for cell in cells] return padded_cells - else: - return cells + return cells def _build_simple_row(padded_cells, rowfmt): @@ -2323,8 +2305,7 @@ def _build_row(padded_cells, colwidths, colaligns, rowfmt): return None if hasattr(rowfmt, "__call__"): return rowfmt(padded_cells, colwidths, colaligns) - else: - return _build_simple_row(padded_cells, rowfmt) + return _build_simple_row(padded_cells, rowfmt) def _append_basic_row(lines, padded_cells, colwidths, colaligns, rowfmt, rowalign=None): @@ -2338,12 +2319,11 @@ def _align_cell_veritically(text_lines, num_lines, column_width, row_alignment): blank = [" " * column_width] if row_alignment == "bottom": return blank * delta_lines + text_lines - elif row_alignment == "center": + if row_alignment == "center": top_delta = delta_lines // 2 bottom_delta = delta_lines - top_delta return top_delta * blank + text_lines + bottom_delta * blank - else: - return text_lines + blank * delta_lines + return text_lines + blank * delta_lines def _append_multiline_row( @@ -2374,10 +2354,10 @@ def _build_line(colwidths, colaligns, linefmt): return None if hasattr(linefmt, "__call__"): return linefmt(colwidths, colaligns) - else: - begin, fill, sep, end = linefmt - cells = [fill * w for w in colwidths] - return _build_simple_row(cells, (begin, sep, end)) + + begin, fill, sep, end = linefmt + cells = [fill * w for w in colwidths] + return _build_simple_row(cells, (begin, sep, end)) def _append_line(lines, colwidths, colaligns, linefmt): @@ -2463,10 +2443,8 @@ def _format_table(fmt, headers, headersaligns, rows, colwidths, colaligns, is_mu output = "\n".join(lines) if fmt.lineabove == _html_begin_table_without_header: # pylint: disable=comparison-with-callable return JupyterHTMLStr(output) - else: - return output - else: # a completely empty table - return "" + return output + return "" class _CustomTextWrap(textwrap.TextWrapper): @@ -2489,8 +2467,7 @@ def _len(item): stripped = _strip_ansi(item) if wcwidth: return wcwidth.wcswidth(stripped) - else: - return len(stripped) + return len(stripped) def _update_lines(self, lines, new_line): """Adds a new line to the list of lines the text is being wrapped into From 5336fdfacbb6fec36f98813a1142a346996cac23 Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:41:23 +0300 Subject: [PATCH 08/10] fix: pylint consider-using-in --- .pylintrc | 1 - tabulate/__init__.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pylintrc b/.pylintrc index 55cf8dd..94dbd35 100644 --- a/.pylintrc +++ b/.pylintrc @@ -436,7 +436,6 @@ disable=raw-checker-failed, invalid-name, consider-using-f-string, unnecessary-lambda-assignment, - consider-using-in, dangerous-default-value, unidiomatic-typecheck, too-many-return-statements, diff --git a/tabulate/__init__.py b/tabulate/__init__.py index 951184f..cdb6917 100644 --- a/tabulate/__init__.py +++ b/tabulate/__init__.py @@ -104,7 +104,7 @@ def _is_file(f): def _is_separating_line(row): row_type = type(row) - is_sl = (row_type == list or row_type == str) and ( + is_sl = (row_type in (list, str)) and ( (len(row) >= 1 and row[0] == SEPARATING_LINE) or (len(row) >= 2 and row[1] == SEPARATING_LINE) ) From 6aa5f8b05ddd0fa48eb972cd7041fd4200c78639 Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:43:12 +0300 Subject: [PATCH 09/10] fix: pylint dangerous-default-value --- .pylintrc | 1 - tabulate/__init__.py | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pylintrc b/.pylintrc index 94dbd35..2bd6d0b 100644 --- a/.pylintrc +++ b/.pylintrc @@ -436,7 +436,6 @@ disable=raw-checker-failed, invalid-name, consider-using-f-string, unnecessary-lambda-assignment, - dangerous-default-value, unidiomatic-typecheck, too-many-return-statements, too-many-arguments, diff --git a/tabulate/__init__.py b/tabulate/__init__.py index cdb6917..51f225f 100644 --- a/tabulate/__init__.py +++ b/tabulate/__init__.py @@ -278,7 +278,9 @@ def make_header_line(is_header, colwidths, colaligns): } -def _latex_row(cell_values, colwidths, colaligns, escrules=LATEX_ESCAPE_RULES): +def _latex_row(cell_values, colwidths, colaligns, escrules=None): + if escrules is None: + escrules = LATEX_ESCAPE_RULES def escape_char(c): return escrules.get(c, c) From 6613a9320782cd6d6fb0fcf96ea645740db8ef16 Mon Sep 17 00:00:00 2001 From: kotborealis Date: Sun, 30 Jul 2023 20:44:44 +0300 Subject: [PATCH 10/10] fix: pylint use-implicit-booleaness-not-len --- .pylintrc | 1 - tabulate/__init__.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pylintrc b/.pylintrc index 2bd6d0b..47408a7 100644 --- a/.pylintrc +++ b/.pylintrc @@ -441,7 +441,6 @@ disable=raw-checker-failed, too-many-arguments, nested-min-max, too-many-locals, - use-implicit-booleaness-not-len, too-many-branches, unspecified-encoding, import-outside-toplevel, diff --git a/tabulate/__init__.py b/tabulate/__init__.py index 51f225f..84da4e1 100644 --- a/tabulate/__init__.py +++ b/tabulate/__init__.py @@ -2078,7 +2078,7 @@ def tabulate( list_of_lists, separating_lines = _remove_separating_lines(list_of_lists) if maxcolwidths is not None: - if len(list_of_lists): + if list_of_lists: num_cols = len(list_of_lists[0]) else: num_cols = 0