Skip to content

Commit bb305b6

Browse files
author
Vladimir Kotal
committed
rename parsers
1 parent e2ecd55 commit bb305b6

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

opengrok-tools/src/main/python/opengrok_tools/config_merge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
from .utils.java import Java
2929
from .utils.log import fatal
30-
from .utils.parsers import get_javaparser
30+
from .utils.parsers import get_java_parser
3131
from .utils.exitvals import (
3232
FAILURE_EXITVAL,
3333
SUCCESS_EXITVAL
@@ -40,7 +40,7 @@
4040
def main():
4141
parser = argparse.ArgumentParser(description='Java wrapper for project '
4242
'configuration merging',
43-
parents=[get_javaparser()])
43+
parents=[get_java_parser()])
4444

4545
try:
4646
args = parser.parse_args()

opengrok-tools/src/main/python/opengrok_tools/deploy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from .utils.log import get_console_logger, get_class_basename, \
3232
fatal
33-
from .utils.parsers import get_baseparser
33+
from .utils.parsers import get_base_parser
3434
from .utils.xml import insert_file, XMLProcessingException
3535

3636
WEB_XML = 'WEB-INF/web.xml'
@@ -124,7 +124,7 @@ def deploy_war(logger, source_war, target_war, config_file=None,
124124

125125
def main():
126126
parser = argparse.ArgumentParser(description='Deploy WAR file',
127-
parents=[get_baseparser()])
127+
parents=[get_base_parser()])
128128

129129
parser.add_argument('-c', '--config',
130130
help='Path to OpenGrok configuration file')

opengrok-tools/src/main/python/opengrok_tools/groups.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
from .utils.java import Java
2828
from .utils.log import get_console_logger, get_class_basename, fatal
29-
from .utils.parsers import get_javaparser
29+
from .utils.parsers import get_java_parser
3030
from .utils.exitvals import (
3131
FAILURE_EXITVAL,
3232
SUCCESS_EXITVAL
@@ -39,7 +39,7 @@
3939
def main():
4040
parser = argparse.ArgumentParser(description='Java wrapper for project '
4141
'group manipulation',
42-
parents=[get_javaparser()])
42+
parents=[get_java_parser()])
4343

4444
try:
4545
args = parser.parse_args()

opengrok-tools/src/main/python/opengrok_tools/indexer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from .utils.indexer import FindCtags, Indexer
3030
from .utils.log import get_console_logger, get_class_basename, fatal
31-
from .utils.parsers import get_javaparser
31+
from .utils.parsers import get_java_parser
3232
from .utils.exitvals import (
3333
FAILURE_EXITVAL,
3434
SUCCESS_EXITVAL
@@ -43,7 +43,7 @@
4343

4444
def main():
4545
parser = argparse.ArgumentParser(description='OpenGrok indexer wrapper',
46-
parents=[get_javaparser()])
46+
parents=[get_java_parser()])
4747
parser.add_argument('-C', '--no_ctags_check', action='store_true',
4848
default=False, help='Suppress checking for ctags')
4949

opengrok-tools/src/main/python/opengrok_tools/java.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
from .utils.java import Java
2929
from .utils.log import get_console_logger, get_class_basename, fatal
30-
from .utils.parsers import get_javaparser
30+
from .utils.parsers import get_java_parser
3131
from .utils.exitvals import (
3232
FAILURE_EXITVAL,
3333
SUCCESS_EXITVAL
@@ -36,7 +36,7 @@
3636

3737
def main():
3838
parser = argparse.ArgumentParser(description='java wrapper',
39-
parents=[get_javaparser()])
39+
parents=[get_java_parser()])
4040
parser.add_argument('-m', '--mainclass', required=True,
4141
help='Main class')
4242

opengrok-tools/src/main/python/opengrok_tools/mirror.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
from .utils.log import get_console_logger, get_class_basename, \
4848
fatal, get_batch_logger
4949
from .utils.opengrok import get_config_value, list_indexed_projects
50-
from .utils.parsers import get_baseparser
50+
from .utils.parsers import get_base_parser
5151
from .utils.readconfig import read_config
5252
from .utils.utils import get_int, is_web_uri
5353
from .utils.mirror import check_configuration, LOGDIR_PROPERTY, \
@@ -80,7 +80,7 @@ def main():
8080
ret = SUCCESS_EXITVAL
8181

8282
parser = argparse.ArgumentParser(description='project mirroring',
83-
parents=[get_baseparser(
83+
parents=[get_base_parser(
8484
tool_version=__version__)
8585
])
8686

opengrok-tools/src/main/python/opengrok_tools/projadm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
fatal
4242
from .utils.opengrok import get_configuration, set_configuration, \
4343
add_project, delete_project, get_config_value
44-
from .utils.parsers import get_baseparser
44+
from .utils.parsers import get_base_parser
4545
from .utils.utils import get_command, is_web_uri
4646
from .utils.exitvals import (
4747
FAILURE_EXITVAL,
@@ -212,7 +212,7 @@ def main():
212212
parser = argparse.ArgumentParser(description='project management.',
213213
formatter_class=argparse.
214214
ArgumentDefaultsHelpFormatter,
215-
parents=[get_baseparser(
215+
parents=[get_base_parser(
216216
tool_version=__version__)
217217
])
218218

opengrok-tools/src/main/python/opengrok_tools/reindex_project.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from .utils.indexer import Indexer
3131
from .utils.log import get_console_logger, get_class_basename, fatal
3232
from .utils.opengrok import get_configuration
33-
from .utils.parsers import get_javaparser
33+
from .utils.parsers import get_java_parser
3434
from .utils.exitvals import (
3535
FAILURE_EXITVAL,
3636
SUCCESS_EXITVAL
@@ -75,7 +75,7 @@ def get_config_file(logger, uri):
7575
def main():
7676
parser = argparse.ArgumentParser(description='OpenGrok indexer wrapper '
7777
'for indexing single project',
78-
parents=[get_javaparser()])
78+
parents=[get_java_parser()])
7979
parser.add_argument('-t', '--template', required=True,
8080
help='Logging template file')
8181
parser.add_argument('-p', '--pattern', required=True,

opengrok-tools/src/main/python/opengrok_tools/sync.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from .utils.commandsequence import CommandSequence, CommandSequenceBase
4040
from .utils.log import get_console_logger, get_class_basename, fatal
4141
from .utils.opengrok import list_indexed_projects, get_config_value
42-
from .utils.parsers import get_baseparser
42+
from .utils.parsers import get_base_parser
4343
from .utils.readconfig import read_config
4444
from .utils.utils import is_web_uri
4545
from .utils.exitvals import (
@@ -71,7 +71,7 @@ def main():
7171

7272
parser = argparse.ArgumentParser(description='Manage parallel workers.',
7373
parents=[
74-
get_baseparser(
74+
get_base_parser(
7575
tool_version=__version__)
7676
])
7777
parser.add_argument('-w', '--workers', default=multiprocessing.cpu_count(),

opengrok-tools/src/main/python/opengrok_tools/utils/parsers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def str2bool(v):
1919
'representation expected.')
2020

2121

22-
def get_baseparser(tool_version=None):
22+
def get_base_parser(tool_version=None):
2323
"""
2424
Get the base parser which supports --version option reporting
2525
the overall version of the tools and the specific version of the
@@ -37,9 +37,9 @@ def get_baseparser(tool_version=None):
3737
return parser
3838

3939

40-
def get_javaparser():
40+
def get_java_parser():
4141
parser = argparse.ArgumentParser(add_help=False,
42-
parents=[get_baseparser()])
42+
parents=[get_base_parser()])
4343
parser.add_argument('-j', '--java',
4444
help='path to java binary')
4545
parser.add_argument('-J', '--java_opts',

0 commit comments

Comments
 (0)