This commit is contained in:
Noah Levitt 2016-10-06 18:20:41 -07:00
parent 59a15d7f5c
commit d82b40be68
3 changed files with 5 additions and 5 deletions

View file

@ -86,7 +86,7 @@ def _configure_logging(args):
warnings.simplefilter( warnings.simplefilter(
'ignore', category=requests.packages.urllib3.exceptions.InsecurePlatformWarning) 'ignore', category=requests.packages.urllib3.exceptions.InsecurePlatformWarning)
def suggest_default_chome_exe(): def suggest_default_chrome_exe():
# mac os x application executable paths # mac os x application executable paths
for path in [ for path in [
'/Applications/Chromium.app/Contents/MacOS/Chromium', '/Applications/Chromium.app/Contents/MacOS/Chromium',
@ -118,7 +118,7 @@ def brozzle_page():
arg_parser.add_argument('url', metavar='URL', help='page url') arg_parser.add_argument('url', metavar='URL', help='page url')
arg_parser.add_argument( arg_parser.add_argument(
'-e', '--chrome-exe', dest='chrome_exe', '-e', '--chrome-exe', dest='chrome_exe',
default=suggest_default_chome_exe(), default=suggest_default_chrome_exe(),
help='executable to use to invoke chrome') help='executable to use to invoke chrome')
arg_parser.add_argument( arg_parser.add_argument(
'--proxy', dest='proxy', default=None, '--proxy', dest='proxy', default=None,
@ -243,7 +243,7 @@ def brozzler_worker():
_add_rethinkdb_options(arg_parser) _add_rethinkdb_options(arg_parser)
arg_parser.add_argument( arg_parser.add_argument(
'-e', '--chrome-exe', dest='chrome_exe', '-e', '--chrome-exe', dest='chrome_exe',
default=suggest_default_chome_exe(), default=suggest_default_chrome_exe(),
help='executable to use to invoke chrome') help='executable to use to invoke chrome')
arg_parser.add_argument( arg_parser.add_argument(
'-n', '--max-browsers', dest='max_browsers', default='1', '-n', '--max-browsers', dest='max_browsers', default='1',

View file

@ -87,7 +87,7 @@ def _build_arg_parser(prog=os.path.basename(sys.argv[0])):
# brozzler-worker args # brozzler-worker args
arg_parser.add_argument( arg_parser.add_argument(
'-e', '--chrome-exe', dest='chrome_exe', '-e', '--chrome-exe', dest='chrome_exe',
default=brozzler.cli.suggest_default_chome_exe(), default=brozzler.cli.suggest_default_chrome_exe(),
help='executable to use to invoke chrome') help='executable to use to invoke chrome')
arg_parser.add_argument( arg_parser.add_argument(
'-n', '--max-browsers', dest='max_browsers', '-n', '--max-browsers', dest='max_browsers',

View file

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup( setuptools.setup(
name='brozzler', name='brozzler',
version='1.1b6.dev92', version='1.1b6.dev93',
description='Distributed web crawling with browsers', description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler', url='https://github.com/internetarchive/brozzler',
author='Noah Levitt', author='Noah Levitt',