0

contribManager: fix code style

This commit is contained in:
Nicolas F
2019-03-14 13:30:22 +01:00
parent daa25d80fd
commit 4be0f07156
2 changed files with 22 additions and 23 deletions

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
# The contrib manager is used to help control the contribs script """The contrib manager is used to help control the contrib scripts
# that are shipped with overviewer in Windows packages that are shipped with overviewer in Windows packages."""
import sys import sys
import os.path import os.path
@@ -13,17 +13,17 @@ if not hasattr(sys, "frozen"):
from overviewer_core import nbt from overviewer_core import nbt
scripts=dict( # keys are names, values are scripts scripts = { # keys are names, values are scripts
convertCyrillic = "cyrillic_convert.py", "convertCyrillic": "cyrillic_convert.py",
playerInspect = "playerInspect.py", "playerInspect": "playerInspect.py",
rerenderBlocks = "rerenderBlocks.py", "rerenderBlocks": "rerenderBlocks.py",
testRender = "testRender.py", "testRender": "testRender.py",
validate = "validateRegionFile.py", "validate": "validateRegionFile.py",
pngit = "png-it.py", "pngit": "png-it.py",
gallery = "gallery.py", "gallery": "gallery.py",
regionTrimmer = "regionTrimmer.py", "regionTrimmer": "regionTrimmer.py",
contributors = "contributors.py" "contributors": "contributors.py"
) }
# you can symlink or hardlink contribManager.py to another name to have it # you can symlink or hardlink contribManager.py to another name to have it
# automatically find the right script to run. For example: # automatically find the right script to run. For example:
@@ -33,15 +33,15 @@ scripts=dict( # keys are names, values are scripts
# figure out what script to execute # figure out what script to execute
argv=os.path.basename(sys.argv[0]) argv = os.path.basename(sys.argv[0])
if argv[-4:] == ".exe": if argv[-4:] == ".exe":
argv=argv[0:-4] argv = argv[0:-4]
if argv[-3:] == ".py": if argv[-3:] == ".py":
argv=argv[0:-3] argv = argv[0:-3]
usage="""Usage: usage = """Usage:
%s --list-contribs | <script name> <arguments> %s --list-contribs | <script name> <arguments>
Executes a contrib script. Executes a contrib script.
@@ -59,14 +59,14 @@ else:
for contrib in scripts.keys(): for contrib in scripts.keys():
# use an AST to extract the docstring for this module # use an AST to extract the docstring for this module
script = scripts[contrib] script = scripts[contrib]
with open(os.path.join("contrib",script)) as f: with open(os.path.join("contrib", script)) as f:
d = f.read() d = f.read()
node=ast.parse(d, script); node = ast.parse(d, script)
docstring = ast.get_docstring(node) docstring = ast.get_docstring(node)
if docstring: if docstring:
docstring = docstring.strip().splitlines()[0] docstring = docstring.strip().splitlines()[0]
else: else:
docstring="(no description found. add one by adding a docstring to %s)" % script docstring = "(No description found. Add one by adding a docstring to %s.)" % script
print "%s : %s" % (contrib, docstring) print "%s : %s" % (contrib, docstring)
sys.exit(0) sys.exit(0)
if len(sys.argv) > 1 and sys.argv[1] in scripts.keys(): if len(sys.argv) > 1 and sys.argv[1] in scripts.keys():
@@ -84,4 +84,3 @@ if not os.path.exists(torun):
sys.exit(1) sys.exit(1)
execfile(torun) execfile(torun)

View File

@@ -1,6 +1,6 @@
[pycodestyle] [pycodestyle]
max_line_length = 100 max_line_length = 100
ignore = E221,E222,E741,W503,W504 ignore = E221,E222,E241,E741,W503,W504
statistics = True statistics = True
[isort] [isort]
line_length = 100 line_length = 100