From c7586a604ef0acd39541e629634b44c884b2bc82 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sun, 26 Apr 2020 21:50:55 +0100 Subject: [PATCH] fix codacy --- .meta/mkcompletion.py | 21 +++++++++++---------- .meta/mkdocs.py | 7 ++++--- Makefile | 2 +- tqdm/cli.py | 7 ++++--- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.meta/mkcompletion.py b/.meta/mkcompletion.py index 0e857eaf..7ae52654 100644 --- a/.meta/mkcompletion.py +++ b/.meta/mkcompletion.py @@ -1,24 +1,25 @@ from __future__ import print_function -from os import path -import sys -sys.path.insert(0, path.dirname(path.dirname(__file__))) # NOQA -import tqdm -import tqdm.cli from io import open as io_open from os import path import re +import sys + +sys.path.insert(0, path.dirname(path.dirname(__file__))) # NOQA +import tqdm +import tqdm.cli RE_OPT = re.compile(r'(\w+) :', flags=re.M) RE_OPT_INPUT = re.compile( r'(\w+) : (?:str|int|float|chr|dict|tuple)', flags=re.M) -def doc2opt(doc, all=False): +def doc2opt(doc, user_input=True): """ doc : str, document to parse - all : bool, [default: False] for only options requiring user input + user_input : bool, optional. + [default: True] for only options requiring user input """ - RE = RE_OPT if all else RE_OPT_INPUT + RE = RE_OPT_INPUT if user_input else RE_OPT return ('--' + i for i in RE.findall(doc)) @@ -26,8 +27,8 @@ def doc2opt(doc, all=False): options = {'-h', '--help', '-v', '--version'} options_input = set() for doc in (tqdm.tqdm.__init__.__doc__, tqdm.cli.CLI_EXTRA_DOC): - options.update(doc2opt(doc, all=True)) - options_input.update(doc2opt(doc, all=False)) + options.update(doc2opt(doc, user_input=False)) + options_input.update(doc2opt(doc, user_input=True)) options.difference_update( '--' + i for i in ('name',) + tqdm.cli.UNSUPPORTED_OPTS) options_input &= options diff --git a/.meta/mkdocs.py b/.meta/mkdocs.py index 5287dfe3..1c52a33c 100644 --- a/.meta/mkdocs.py +++ b/.meta/mkdocs.py @@ -1,12 +1,13 @@ from __future__ import print_function +from io import open as io_open from os import path import sys +from textwrap import dedent + sys.path.insert(0, path.dirname(path.dirname(__file__))) # NOQA import tqdm import tqdm.cli -from textwrap import dedent -from io import open as io_open -from os import path + HEAD_ARGS = """ Parameters diff --git a/Makefile b/Makefile index f1e5433c..459d0303 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ tqdm/tqdm.1: .meta/.tqdm.1.md tqdm/cli.py tqdm/std.py cat "$<" - |\ pandoc -o "$@" -s -t man -tqdm/completion.sh: tqdm/std.py tqdm/cli.py +tqdm/completion.sh: .meta/mkcompletion.py tqdm/std.py tqdm/cli.py @python .meta/mkcompletion.py README.rst: .meta/.readme.rst tqdm/std.py tqdm/cli.py diff --git a/tqdm/cli.py b/tqdm/cli.py index ea05018e..bf1cddeb 100644 --- a/tqdm/cli.py +++ b/tqdm/cli.py @@ -210,9 +210,10 @@ Options: from shutil import copyfile from pkg_resources import resource_filename, Requirement - def cp(fi, fo): - copyfile(fi, fo) - log.info("written:" + fo) + def cp(src, dst): + """copies from src path to dst""" + copyfile(src, dst) + log.info("written:" + dst) if manpath is not None: cp(resource_filename(Requirement.parse('tqdm'), 'tqdm/tqdm.1'), path.join(manpath, 'tqdm.1'))