Commit 82f129d

Browse files
KiYugadgeterrvagg
KiYugadgeter
authored and
rvagg
committed
gyp: replace optparse to argparse
 * add_option with add_argument for argparse * change methods methods of RegeneratableOptionParser to match argparse function name PR-URL: #1591 Reviewed-By: cclauss <cclauss@me.com>
1 parent afaaa29 commit 82f129d

1 file changed

Lines changed: 29 additions & 29 deletions

File tree

‎gyp/pylib/gyp/__init__.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
importcopy
1010
importgyp.input
11-
importoptparse
11+
importargparse
1212
importos.path
1313
importre
1414
importshlex
@@ -244,15 +244,15 @@ def Noop(value):
244244

245245
returnflags
246246

247-
classRegeneratableOptionParser(optparse.OptionParser):
248-
def__init__(self):
247+
classRegeneratableOptionParser(argparse.ArgumentParser):
248+
def__init__(self, usage):
249249
self.__regeneratable_options= {}
250-
optparse.OptionParser.__init__(self)
250+
argparse.ArgumentParser.__init__(self, usage=usage)
251251

252-
defadd_option(self, *args, **kw):
252+
defadd_argument(self, *args, **kw):
253253
"""Add an option to the parser.
254254
255-
This accepts the same arguments as OptionParser.add_option, plus the
255+
This accepts the same arguments as ArgumentParser.add_argument, plus the
256256
following:
257257
regenerate: can be set to False to prevent this option from being included
258258
in regeneration.
@@ -269,7 +269,7 @@ def add_option(self, *args, **kw):
269269
# it as a string.
270270
type=kw.get('type')
271271
iftype=='path':
272-
kw['type'] ='string'
272+
kw['type'] =str
273273

274274
self.__regeneratable_options[dest] = {
275275
'action': kw.get('action'),
@@ -278,50 +278,50 @@ def add_option(self, *args, **kw):
278278
'opt': args[0],
279279
}
280280

281-
optparse.OptionParser.add_option(self, *args, **kw)
281+
argparse.ArgumentParser.add_argument(self, *args, **kw)
282282

283283
defparse_args(self, *args):
284-
values, args=optparse.OptionParser.parse_args(self, *args)
284+
values, args=argparse.ArgumentParser.parse_known_args(self, *args)
285285
values._regeneration_metadata=self.__regeneratable_options
286286
returnvalues, args
287287

288288
defgyp_main(args):
289289
my_name=os.path.basename(sys.argv[0])
290+
usage='usage: %(prog)s [options ...] [build_file ...]'
290291

291-
parser=RegeneratableOptionParser()
292-
usage='usage: %s [options ...] [build_file ...]'
293-
parser.set_usage(usage.replace('%s', '%prog'))
294-
parser.add_option('--build', dest='configs', action='append',
292+
293+
parser=RegeneratableOptionParser(usage=usage.replace('%s', '%(prog)s'))
294+
parser.add_argument('--build', dest='configs', action='append',
295295
help='configuration for build after project generation')
296-
parser.add_option('--check', dest='check', action='store_true',
296+
parser.add_argument('--check', dest='check', action='store_true',
297297
help='check format of gyp files')
298-
parser.add_option('--config-dir', dest='config_dir', action='store',
298+
parser.add_argument('--config-dir', dest='config_dir', action='store',
299299
env_name='GYP_CONFIG_DIR', default=None,
300300
help='The location for configuration files like '
301301
'include.gypi.')
302-
parser.add_option('-d', '--debug', dest='debug', metavar='DEBUGMODE',
302+
parser.add_argument('-d', '--debug', dest='debug', metavar='DEBUGMODE',
303303
action='append', default=[], help='turn on a debugging '
304304
'mode for debugging GYP. Supported modes are "variables", '
305305
'"includes" and "general" or "all" for all of them.')
306-
parser.add_option('-D', dest='defines', action='append', metavar='VAR=VAL',
306+
parser.add_argument('-D', dest='defines', action='append', metavar='VAR=VAL',
307307
env_name='GYP_DEFINES',
308308
help='sets variable VAR to value VAL')
309-
parser.add_option('--depth', dest='depth', metavar='PATH', type='path',
309+
parser.add_argument('--depth', dest='depth', metavar='PATH', type='path',
310310
help='set DEPTH gyp variable to a relative path to PATH')
311-
parser.add_option('-f', '--format', dest='formats', action='append',
311+
parser.add_argument('-f', '--format', dest='formats', action='append',
312312
env_name='GYP_GENERATORS', regenerate=False,
313313
help='output formats to generate')
314-
parser.add_option('-G', dest='generator_flags', action='append', default=[],
314+
parser.add_argument('-G', dest='generator_flags', action='append', default=[],
315315
metavar='FLAG=VAL', env_name='GYP_GENERATOR_FLAGS',
316316
help='sets generator flag FLAG to VAL')
317-
parser.add_option('--generator-output', dest='generator_output',
317+
parser.add_argument('--generator-output', dest='generator_output',
318318
action='store', default=None, metavar='DIR', type='path',
319319
env_name='GYP_GENERATOR_OUTPUT',
320320
help='puts generated build files under DIR')
321-
parser.add_option('--ignore-environment', dest='use_environment',
321+
parser.add_argument('--ignore-environment', dest='use_environment',
322322
action='store_false', default=True, regenerate=False,
323323
help='do not read options from environment variables')
324-
parser.add_option('-I', '--include', dest='includes', action='append',
324+
parser.add_argument('-I', '--include', dest='includes', action='append',
325325
metavar='INCLUDE', type='path',
326326
help='files to include in all loaded .gyp files')
327327
# --no-circular-check disables the check for circular relationships between
@@ -331,7 +331,7 @@ def gyp_main(args):
331331
# option allows the strict behavior to be used on Macs and the lenient
332332
# behavior to be used elsewhere.
333333
# TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
334-
parser.add_option('--no-circular-check', dest='circular_check',
334+
parser.add_argument('--no-circular-check', dest='circular_check',
335335
action='store_false', default=True, regenerate=False,
336336
help="don't check for circular relationships between files")
337337
# --no-duplicate-basename-check disables the check for duplicate basenames
@@ -340,18 +340,18 @@ def gyp_main(args):
340340
# when duplicate basenames are passed into Make generator on Mac.
341341
# TODO(yukawa): Remove this option when these legacy generators are
342342
# deprecated.
343-
parser.add_option('--no-duplicate-basename-check',
343+
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345345
default=True, regenerate=False,
346346
help="don't check for duplicate basenames")
347-
parser.add_option('--no-parallel', action='store_true', default=False,
347+
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')
349-
parser.add_option('-S', '--suffix', dest='suffix', default='',
349+
parser.add_argument('-S', '--suffix', dest='suffix', default='',
350350
help='suffix to add to generated files')
351-
parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
351+
parser.add_argument('--toplevel-dir', dest='toplevel_dir', action='store',
352352
default=None, metavar='DIR', type='path',
353353
help='directory to use as the root of the source tree')
354-
parser.add_option('-R', '--root-target', dest='root_targets',
354+
parser.add_argument('-R', '--root-target', dest='root_targets',
355355
action='append', metavar='TARGET',
356356
help='include only TARGET and its deep dependencies')
357357

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 82f129d
Browse files
KiYugadgeterrvagg
KiYugadgeter
authored and
rvagg
committed
gyp: replace optparse to argparse
 * add_option with add_argument for argparse
* change methods methods of RegeneratableOptionParser to match argparse function name
PR-URL: #1591
Reviewed-By: cclauss <cclauss@me.com>
1 parent afaaa29 commit 82f129d
1 file changed
Lines changed: 29 additions & 29 deletions
File tree
‎gyp/pylib/gyp/__init__.py‎
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
importcopy
1010
importgyp.input
11-
importoptparse
11+
importargparse
1212
importos.path
1313
importre
1414
importshlex
@@ -244,15 +244,15 @@ def Noop(value):
244244

245245
returnflags
246246

247-
classRegeneratableOptionParser(optparse.OptionParser):
248-
def__init__(self):
247+
classRegeneratableOptionParser(argparse.ArgumentParser):
248+
def__init__(self, usage):
249249
self.__regeneratable_options= {}
250-
optparse.OptionParser.__init__(self)
250+
argparse.ArgumentParser.__init__(self, usage=usage)
251251

252-
defadd_option(self, *args, **kw):
252+
defadd_argument(self, *args, **kw):
253253
"""Add an option to the parser.
254254
255-
 This accepts the same arguments as OptionParser.add_option, plus the
255+
 This accepts the same arguments as ArgumentParser.add_argument, plus the
256256
 following:
257257
 regenerate: can be set to False to prevent this option from being included
258258
 in regeneration.
@@ -269,7 +269,7 @@ def add_option(self, *args, **kw):
269269
# it as a string.
270270
type=kw.get('type')
271271
iftype=='path':
272-
kw['type'] ='string'
272+
kw['type'] =str
273273

274274
self.__regeneratable_options[dest] = {
275275
'action': kw.get('action'),
@@ -278,50 +278,50 @@ def add_option(self, *args, **kw):
278278
'opt': args[0],
279279
 }
280280

281-
optparse.OptionParser.add_option(self, *args, **kw)
281+
argparse.ArgumentParser.add_argument(self, *args, **kw)
282282

283283
defparse_args(self, *args):
284-
values, args=optparse.OptionParser.parse_args(self, *args)
284+
values, args=argparse.ArgumentParser.parse_known_args(self, *args)
285285
values._regeneration_metadata=self.__regeneratable_options
286286
returnvalues, args
287287

288288
defgyp_main(args):
289289
my_name=os.path.basename(sys.argv[0])
290+
usage='usage: %(prog)s [options ...] [build_file ...]'
290291

291-
parser=RegeneratableOptionParser()
292-
usage='usage: %s [options ...] [build_file ...]'
293-
parser.set_usage(usage.replace('%s', '%prog'))
294-
parser.add_option('--build', dest='configs', action='append',
292+
293+
parser=RegeneratableOptionParser(usage=usage.replace('%s', '%(prog)s'))
294+
parser.add_argument('--build', dest='configs', action='append',
295295
help='configuration for build after project generation')
296-
parser.add_option('--check', dest='check', action='store_true',
296+
parser.add_argument('--check', dest='check', action='store_true',
297297
help='check format of gyp files')
298-
parser.add_option('--config-dir', dest='config_dir', action='store',
298+
parser.add_argument('--config-dir', dest='config_dir', action='store',
299299
env_name='GYP_CONFIG_DIR', default=None,
300300
help='The location for configuration files like '
301301
'include.gypi.')
302-
parser.add_option('-d', '--debug', dest='debug', metavar='DEBUGMODE',
302+
parser.add_argument('-d', '--debug', dest='debug', metavar='DEBUGMODE',
303303
action='append', default=[], help='turn on a debugging '
304304
'mode for debugging GYP. Supported modes are "variables", '
305305
'"includes" and "general" or "all" for all of them.')
306-
parser.add_option('-D', dest='defines', action='append', metavar='VAR=VAL',
306+
parser.add_argument('-D', dest='defines', action='append', metavar='VAR=VAL',
307307
env_name='GYP_DEFINES',
308308
help='sets variable VAR to value VAL')
309-
parser.add_option('--depth', dest='depth', metavar='PATH', type='path',
309+
parser.add_argument('--depth', dest='depth', metavar='PATH', type='path',
310310
help='set DEPTH gyp variable to a relative path to PATH')
311-
parser.add_option('-f', '--format', dest='formats', action='append',
311+
parser.add_argument('-f', '--format', dest='formats', action='append',
312312
env_name='GYP_GENERATORS', regenerate=False,
313313
help='output formats to generate')
314-
parser.add_option('-G', dest='generator_flags', action='append', default=[],
314+
parser.add_argument('-G', dest='generator_flags', action='append', default=[],
315315
metavar='FLAG=VAL', env_name='GYP_GENERATOR_FLAGS',
316316
help='sets generator flag FLAG to VAL')
317-
parser.add_option('--generator-output', dest='generator_output',
317+
parser.add_argument('--generator-output', dest='generator_output',
318318
action='store', default=None, metavar='DIR', type='path',
319319
env_name='GYP_GENERATOR_OUTPUT',
320320
help='puts generated build files under DIR')
321-
parser.add_option('--ignore-environment', dest='use_environment',
321+
parser.add_argument('--ignore-environment', dest='use_environment',
322322
action='store_false', default=True, regenerate=False,
323323
help='do not read options from environment variables')
324-
parser.add_option('-I', '--include', dest='includes', action='append',
324+
parser.add_argument('-I', '--include', dest='includes', action='append',
325325
metavar='INCLUDE', type='path',
326326
help='files to include in all loaded .gyp files')
327327
# --no-circular-check disables the check for circular relationships between
@@ -331,7 +331,7 @@ def gyp_main(args):
331331
# option allows the strict behavior to be used on Macs and the lenient
332332
# behavior to be used elsewhere.
333333
# TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
334-
parser.add_option('--no-circular-check', dest='circular_check',
334+
parser.add_argument('--no-circular-check', dest='circular_check',
335335
action='store_false', default=True, regenerate=False,
336336
help="don't check for circular relationships between files")
337337
# --no-duplicate-basename-check disables the check for duplicate basenames
@@ -340,18 +340,18 @@ def gyp_main(args):
340340
# when duplicate basenames are passed into Make generator on Mac.
341341
# TODO(yukawa): Remove this option when these legacy generators are
342342
# deprecated.
343-
parser.add_option('--no-duplicate-basename-check',
343+
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345345
default=True, regenerate=False,
346346
help="don't check for duplicate basenames")
347-
parser.add_option('--no-parallel', action='store_true', default=False,
347+
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')
349-
parser.add_option('-S', '--suffix', dest='suffix', default='',
349+
parser.add_argument('-S', '--suffix', dest='suffix', default='',
350350
help='suffix to add to generated files')
351-
parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
351+
parser.add_argument('--toplevel-dir', dest='toplevel_dir', action='store',
352352
default=None, metavar='DIR', type='path',
353353
help='directory to use as the root of the source tree')
354-
parser.add_option('-R', '--root-target', dest='root_targets',
354+
parser.add_argument('-R', '--root-target', dest='root_targets',
355355
action='append', metavar='TARGET',
356356
help='include only TARGET and its deep dependencies')
357357

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 82f129d
Browse files
KiYugadgeterrvagg
KiYugadgeter
authored and
rvagg
committed
gyp: replace optparse to argparse
 * add_option with add_argument for argparse
* change methods methods of RegeneratableOptionParser to match argparse function name
PR-URL: #1591
Reviewed-By: cclauss <cclauss@me.com>
1 parent afaaa29 commit 82f129d
1 file changed
Lines changed: 29 additions & 29 deletions
File tree
‎gyp/pylib/gyp/__init__.py‎
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
importcopy
1010
importgyp.input
11-
importoptparse
11+
importargparse
1212
importos.path
1313
importre
1414
importshlex
@@ -244,15 +244,15 @@ def Noop(value):
244244

245245
returnflags
246246

247-
classRegeneratableOptionParser(optparse.OptionParser):
248-
def__init__(self):
247+
classRegeneratableOptionParser(argparse.ArgumentParser):
248+
def__init__(self, usage):
249249
self.__regeneratable_options= {}
250-
optparse.OptionParser.__init__(self)
250+
argparse.ArgumentParser.__init__(self, usage=usage)
251251

252-
defadd_option(self, *args, **kw):
252+
defadd_argument(self, *args, **kw):
253253
"""Add an option to the parser.
254254
255-
 This accepts the same arguments as OptionParser.add_option, plus the
255+
 This accepts the same arguments as ArgumentParser.add_argument, plus the
256256
 following:
257257
 regenerate: can be set to False to prevent this option from being included
258258
 in regeneration.
@@ -269,7 +269,7 @@ def add_option(self, *args, **kw):
269269
# it as a string.
270270
type=kw.get('type')
271271
iftype=='path':
272-
kw['type'] ='string'
272+
kw['type'] =str
273273

274274
self.__regeneratable_options[dest] = {
275275
'action': kw.get('action'),
@@ -278,50 +278,50 @@ def add_option(self, *args, **kw):
278278
'opt': args[0],
279279
 }
280280

281-
optparse.OptionParser.add_option(self, *args, **kw)
281+
argparse.ArgumentParser.add_argument(self, *args, **kw)
282282

283283
defparse_args(self, *args):
284-
values, args=optparse.OptionParser.parse_args(self, *args)
284+
values, args=argparse.ArgumentParser.parse_known_args(self, *args)
285285
values._regeneration_metadata=self.__regeneratable_options
286286
returnvalues, args
287287

288288
defgyp_main(args):
289289
my_name=os.path.basename(sys.argv[0])
290+
usage='usage: %(prog)s [options ...] [build_file ...]'
290291

291-
parser=RegeneratableOptionParser()
292-
usage='usage: %s [options ...] [build_file ...]'
293-
parser.set_usage(usage.replace('%s', '%prog'))
294-
parser.add_option('--build', dest='configs', action='append',
292+
293+
parser=RegeneratableOptionParser(usage=usage.replace('%s', '%(prog)s'))
294+
parser.add_argument('--build', dest='configs', action='append',
295295
help='configuration for build after project generation')
296-
parser.add_option('--check', dest='check', action='store_true',
296+
parser.add_argument('--check', dest='check', action='store_true',
297297
help='check format of gyp files')
298-
parser.add_option('--config-dir', dest='config_dir', action='store',
298+
parser.add_argument('--config-dir', dest='config_dir', action='store',
299299
env_name='GYP_CONFIG_DIR', default=None,
300300
help='The location for configuration files like '
301301
'include.gypi.')
302-
parser.add_option('-d', '--debug', dest='debug', metavar='DEBUGMODE',
302+
parser.add_argument('-d', '--debug', dest='debug', metavar='DEBUGMODE',
303303
action='append', default=[], help='turn on a debugging '
304304
'mode for debugging GYP. Supported modes are "variables", '
305305
'"includes" and "general" or "all" for all of them.')
306-
parser.add_option('-D', dest='defines', action='append', metavar='VAR=VAL',
306+
parser.add_argument('-D', dest='defines', action='append', metavar='VAR=VAL',
307307
env_name='GYP_DEFINES',
308308
help='sets variable VAR to value VAL')
309-
parser.add_option('--depth', dest='depth', metavar='PATH', type='path',
309+
parser.add_argument('--depth', dest='depth', metavar='PATH', type='path',
310310
help='set DEPTH gyp variable to a relative path to PATH')
311-
parser.add_option('-f', '--format', dest='formats', action='append',
311+
parser.add_argument('-f', '--format', dest='formats', action='append',
312312
env_name='GYP_GENERATORS', regenerate=False,
313313
help='output formats to generate')
314-
parser.add_option('-G', dest='generator_flags', action='append', default=[],
314+
parser.add_argument('-G', dest='generator_flags', action='append', default=[],
315315
metavar='FLAG=VAL', env_name='GYP_GENERATOR_FLAGS',
316316
help='sets generator flag FLAG to VAL')
317-
parser.add_option('--generator-output', dest='generator_output',
317+
parser.add_argument('--generator-output', dest='generator_output',
318318
action='store', default=None, metavar='DIR', type='path',
319319
env_name='GYP_GENERATOR_OUTPUT',
320320
help='puts generated build files under DIR')
321-
parser.add_option('--ignore-environment', dest='use_environment',
321+
parser.add_argument('--ignore-environment', dest='use_environment',
322322
action='store_false', default=True, regenerate=False,
323323
help='do not read options from environment variables')
324-
parser.add_option('-I', '--include', dest='includes', action='append',
324+
parser.add_argument('-I', '--include', dest='includes', action='append',
325325
metavar='INCLUDE', type='path',
326326
help='files to include in all loaded .gyp files')
327327
# --no-circular-check disables the check for circular relationships between
@@ -331,7 +331,7 @@ def gyp_main(args):
331331
# option allows the strict behavior to be used on Macs and the lenient
332332
# behavior to be used elsewhere.
333333
# TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
334-
parser.add_option('--no-circular-check', dest='circular_check',
334+
parser.add_argument('--no-circular-check', dest='circular_check',
335335
action='store_false', default=True, regenerate=False,
336336
help="don't check for circular relationships between files")
337337
# --no-duplicate-basename-check disables the check for duplicate basenames
@@ -340,18 +340,18 @@ def gyp_main(args):
340340
# when duplicate basenames are passed into Make generator on Mac.
341341
# TODO(yukawa): Remove this option when these legacy generators are
342342
# deprecated.
343-
parser.add_option('--no-duplicate-basename-check',
343+
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345345
default=True, regenerate=False,
346346
help="don't check for duplicate basenames")
347-
parser.add_option('--no-parallel', action='store_true', default=False,
347+
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')
349-
parser.add_option('-S', '--suffix', dest='suffix', default='',
349+
parser.add_argument('-S', '--suffix', dest='suffix', default='',
350350
help='suffix to add to generated files')
351-
parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
351+
parser.add_argument('--toplevel-dir', dest='toplevel_dir', action='store',
352352
default=None, metavar='DIR', type='path',
353353
help='directory to use as the root of the source tree')
354-
parser.add_option('-R', '--root-target', dest='root_targets',
354+
parser.add_argument('-R', '--root-target', dest='root_targets',
355355
action='append', metavar='TARGET',
356356
help='include only TARGET and its deep dependencies')
357357

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 82f129d
Browse files
KiYugadgeterrvagg
KiYugadgeter
authored and
rvagg
committed
gyp: replace optparse to argparse
 * add_option with add_argument for argparse
* change methods methods of RegeneratableOptionParser to match argparse function name
PR-URL: #1591
Reviewed-By: cclauss <cclauss@me.com>
1 parent afaaa29 commit 82f129d
1 file changed
Lines changed: 29 additions & 29 deletions
File tree
‎gyp/pylib/gyp/__init__.py‎
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
importcopy
1010
importgyp.input
11-
importoptparse
11+
importargparse
1212
importos.path
1313
importre
1414
importshlex
@@ -244,15 +244,15 @@ def Noop(value):
244244

245245
returnflags
246246

247-
classRegeneratableOptionParser(optparse.OptionParser):
248-
def__init__(self):
247+
classRegeneratableOptionParser(argparse.ArgumentParser):
248+
def__init__(self, usage):
249249
self.__regeneratable_options= {}
250-
optparse.OptionParser.__init__(self)
250+
argparse.ArgumentParser.__init__(self, usage=usage)
251251

252-
defadd_option(self, *args, **kw):
252+
defadd_argument(self, *args, **kw):
253253
"""Add an option to the parser.
254254
255-
 This accepts the same arguments as OptionParser.add_option, plus the
255+
 This accepts the same arguments as ArgumentParser.add_argument, plus the
256256
 following:
257257
 regenerate: can be set to False to prevent this option from being included
258258
 in regeneration.
@@ -269,7 +269,7 @@ def add_option(self, *args, **kw):
269269
# it as a string.
270270
type=kw.get('type')
271271
iftype=='path':
272-
kw['type'] ='string'
272+
kw['type'] =str
273273

274274
self.__regeneratable_options[dest] = {
275275
'action': kw.get('action'),
@@ -278,50 +278,50 @@ def add_option(self, *args, **kw):
278278
'opt': args[0],
279279
 }
280280

281-
optparse.OptionParser.add_option(self, *args, **kw)
281+
argparse.ArgumentParser.add_argument(self, *args, **kw)
282282

283283
defparse_args(self, *args):
284-
values, args=optparse.OptionParser.parse_args(self, *args)
284+
values, args=argparse.ArgumentParser.parse_known_args(self, *args)
285285
values._regeneration_metadata=self.__regeneratable_options
286286
returnvalues, args
287287

288288
defgyp_main(args):
289289
my_name=os.path.basename(sys.argv[0])
290+
usage='usage: %(prog)s [options ...] [build_file ...]'
290291

291-
parser=RegeneratableOptionParser()
292-
usage='usage: %s [options ...] [build_file ...]'
293-
parser.set_usage(usage.replace('%s', '%prog'))
294-
parser.add_option('--build', dest='configs', action='append',
292+
293+
parser=RegeneratableOptionParser(usage=usage.replace('%s', '%(prog)s'))
294+
parser.add_argument('--build', dest='configs', action='append',
295295
help='configuration for build after project generation')
296-
parser.add_option('--check', dest='check', action='store_true',
296+
parser.add_argument('--check', dest='check', action='store_true',
297297
help='check format of gyp files')
298-
parser.add_option('--config-dir', dest='config_dir', action='store',
298+
parser.add_argument('--config-dir', dest='config_dir', action='store',
299299
env_name='GYP_CONFIG_DIR', default=None,
300300
help='The location for configuration files like '
301301
'include.gypi.')
302-
parser.add_option('-d', '--debug', dest='debug', metavar='DEBUGMODE',
302+
parser.add_argument('-d', '--debug', dest='debug', metavar='DEBUGMODE',
303303
action='append', default=[], help='turn on a debugging '
304304
'mode for debugging GYP. Supported modes are "variables", '
305305
'"includes" and "general" or "all" for all of them.')
306-
parser.add_option('-D', dest='defines', action='append', metavar='VAR=VAL',
306+
parser.add_argument('-D', dest='defines', action='append', metavar='VAR=VAL',
307307
env_name='GYP_DEFINES',
308308
help='sets variable VAR to value VAL')
309-
parser.add_option('--depth', dest='depth', metavar='PATH', type='path',
309+
parser.add_argument('--depth', dest='depth', metavar='PATH', type='path',
310310
help='set DEPTH gyp variable to a relative path to PATH')
311-
parser.add_option('-f', '--format', dest='formats', action='append',
311+
parser.add_argument('-f', '--format', dest='formats', action='append',
312312
env_name='GYP_GENERATORS', regenerate=False,
313313
help='output formats to generate')
314-
parser.add_option('-G', dest='generator_flags', action='append', default=[],
314+
parser.add_argument('-G', dest='generator_flags', action='append', default=[],
315315
metavar='FLAG=VAL', env_name='GYP_GENERATOR_FLAGS',
316316
help='sets generator flag FLAG to VAL')
317-
parser.add_option('--generator-output', dest='generator_output',
317+
parser.add_argument('--generator-output', dest='generator_output',
318318
action='store', default=None, metavar='DIR', type='path',
319319
env_name='GYP_GENERATOR_OUTPUT',
320320
help='puts generated build files under DIR')
321-
parser.add_option('--ignore-environment', dest='use_environment',
321+
parser.add_argument('--ignore-environment', dest='use_environment',
322322
action='store_false', default=True, regenerate=False,
323323
help='do not read options from environment variables')
324-
parser.add_option('-I', '--include', dest='includes', action='append',
324+
parser.add_argument('-I', '--include', dest='includes', action='append',
325325
metavar='INCLUDE', type='path',
326326
help='files to include in all loaded .gyp files')
327327
# --no-circular-check disables the check for circular relationships between
@@ -331,7 +331,7 @@ def gyp_main(args):
331331
# option allows the strict behavior to be used on Macs and the lenient
332332
# behavior to be used elsewhere.
333333
# TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
334-
parser.add_option('--no-circular-check', dest='circular_check',
334+
parser.add_argument('--no-circular-check', dest='circular_check',
335335
action='store_false', default=True, regenerate=False,
336336
help="don't check for circular relationships between files")
337337
# --no-duplicate-basename-check disables the check for duplicate basenames
@@ -340,18 +340,18 @@ def gyp_main(args):
340340
# when duplicate basenames are passed into Make generator on Mac.
341341
# TODO(yukawa): Remove this option when these legacy generators are
342342
# deprecated.
343-
parser.add_option('--no-duplicate-basename-check',
343+
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345345
default=True, regenerate=False,
346346
help="don't check for duplicate basenames")
347-
parser.add_option('--no-parallel', action='store_true', default=False,
347+
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')
349-
parser.add_option('-S', '--suffix', dest='suffix', default='',
349+
parser.add_argument('-S', '--suffix', dest='suffix', default='',
350350
help='suffix to add to generated files')
351-
parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
351+
parser.add_argument('--toplevel-dir', dest='toplevel_dir', action='store',
352352
default=None, metavar='DIR', type='path',
353353
help='directory to use as the root of the source tree')
354-
parser.add_option('-R', '--root-target', dest='root_targets',
354+
parser.add_argument('-R', '--root-target', dest='root_targets',
355355
action='append', metavar='TARGET',
356356
help='include only TARGET and its deep dependencies')
357357

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 82f129d
Browse files
KiYugadgeterrvagg
KiYugadgeter
authored and
rvagg
committed
gyp: replace optparse to argparse
 * add_option with add_argument for argparse
* change methods methods of RegeneratableOptionParser to match argparse function name
PR-URL: #1591
Reviewed-By: cclauss <cclauss@me.com>
1 parent afaaa29 commit 82f129d
1 file changed
Lines changed: 29 additions & 29 deletions
File tree
‎gyp/pylib/gyp/__init__.py‎
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
importcopy
1010
importgyp.input
11-
importoptparse
11+
importargparse
1212
importos.path
1313
importre
1414
importshlex
@@ -244,15 +244,15 @@ def Noop(value):
244244

245245
returnflags
246246

247-
classRegeneratableOptionParser(optparse.OptionParser):
248-
def__init__(self):
247+
classRegeneratableOptionParser(argparse.ArgumentParser):
248+
def__init__(self, usage):
249249
self.__regeneratable_options= {}
250-
optparse.OptionParser.__init__(self)
250+
argparse.ArgumentParser.__init__(self, usage=usage)
251251

252-
defadd_option(self, *args, **kw):
252+
defadd_argument(self, *args, **kw):
253253
"""Add an option to the parser.
254254
255-
 This accepts the same arguments as OptionParser.add_option, plus the
255+
 This accepts the same arguments as ArgumentParser.add_argument, plus the
256256
 following:
257257
 regenerate: can be set to False to prevent this option from being included
258258
 in regeneration.
@@ -269,7 +269,7 @@ def add_option(self, *args, **kw):
269269
# it as a string.
270270
type=kw.get('type')
271271
iftype=='path':
272-
kw['type'] ='string'
272+
kw['type'] =str
273273

274274
self.__regeneratable_options[dest] = {
275275
'action': kw.get('action'),
@@ -278,50 +278,50 @@ def add_option(self, *args, **kw):
278278
'opt': args[0],
279279
 }
280280

281-
optparse.OptionParser.add_option(self, *args, **kw)
281+
argparse.ArgumentParser.add_argument(self, *args, **kw)
282282

283283
defparse_args(self, *args):
284-
values, args=optparse.OptionParser.parse_args(self, *args)
284+
values, args=argparse.ArgumentParser.parse_known_args(self, *args)
285285
values._regeneration_metadata=self.__regeneratable_options
286286
returnvalues, args
287287

288288
defgyp_main(args):
289289
my_name=os.path.basename(sys.argv[0])
290+
usage='usage: %(prog)s [options ...] [build_file ...]'
290291

291-
parser=RegeneratableOptionParser()
292-
usage='usage: %s [options ...] [build_file ...]'
293-
parser.set_usage(usage.replace('%s', '%prog'))
294-
parser.add_option('--build', dest='configs', action='append',
292+
293+
parser=RegeneratableOptionParser(usage=usage.replace('%s', '%(prog)s'))
294+
parser.add_argument('--build', dest='configs', action='append',
295295
help='configuration for build after project generation')
296-
parser.add_option('--check', dest='check', action='store_true',
296+
parser.add_argument('--check', dest='check', action='store_true',
297297
help='check format of gyp files')
298-
parser.add_option('--config-dir', dest='config_dir', action='store',
298+
parser.add_argument('--config-dir', dest='config_dir', action='store',
299299
env_name='GYP_CONFIG_DIR', default=None,
300300
help='The location for configuration files like '
301301
'include.gypi.')
302-
parser.add_option('-d', '--debug', dest='debug', metavar='DEBUGMODE',
302+
parser.add_argument('-d', '--debug', dest='debug', metavar='DEBUGMODE',
303303
action='append', default=[], help='turn on a debugging '
304304
'mode for debugging GYP. Supported modes are "variables", '
305305
'"includes" and "general" or "all" for all of them.')
306-
parser.add_option('-D', dest='defines', action='append', metavar='VAR=VAL',
306+
parser.add_argument('-D', dest='defines', action='append', metavar='VAR=VAL',
307307
env_name='GYP_DEFINES',
308308
help='sets variable VAR to value VAL')
309-
parser.add_option('--depth', dest='depth', metavar='PATH', type='path',
309+
parser.add_argument('--depth', dest='depth', metavar='PATH', type='path',
310310
help='set DEPTH gyp variable to a relative path to PATH')
311-
parser.add_option('-f', '--format', dest='formats', action='append',
311+
parser.add_argument('-f', '--format', dest='formats', action='append',
312312
env_name='GYP_GENERATORS', regenerate=False,
313313
help='output formats to generate')
314-
parser.add_option('-G', dest='generator_flags', action='append', default=[],
314+
parser.add_argument('-G', dest='generator_flags', action='append', default=[],
315315
metavar='FLAG=VAL', env_name='GYP_GENERATOR_FLAGS',
316316
help='sets generator flag FLAG to VAL')
317-
parser.add_option('--generator-output', dest='generator_output',
317+
parser.add_argument('--generator-output', dest='generator_output',
318318
action='store', default=None, metavar='DIR', type='path',
319319
env_name='GYP_GENERATOR_OUTPUT',
320320
help='puts generated build files under DIR')
321-
parser.add_option('--ignore-environment', dest='use_environment',
321+
parser.add_argument('--ignore-environment', dest='use_environment',
322322
action='store_false', default=True, regenerate=False,
323323
help='do not read options from environment variables')
324-
parser.add_option('-I', '--include', dest='includes', action='append',
324+
parser.add_argument('-I', '--include', dest='includes', action='append',
325325
metavar='INCLUDE', type='path',
326326
help='files to include in all loaded .gyp files')
327327
# --no-circular-check disables the check for circular relationships between
@@ -331,7 +331,7 @@ def gyp_main(args):
331331
# option allows the strict behavior to be used on Macs and the lenient
332332
# behavior to be used elsewhere.
333333
# TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
334-
parser.add_option('--no-circular-check', dest='circular_check',
334+
parser.add_argument('--no-circular-check', dest='circular_check',
335335
action='store_false', default=True, regenerate=False,
336336
help="don't check for circular relationships between files")
337337
# --no-duplicate-basename-check disables the check for duplicate basenames
@@ -340,18 +340,18 @@ def gyp_main(args):
340340
# when duplicate basenames are passed into Make generator on Mac.
341341
# TODO(yukawa): Remove this option when these legacy generators are
342342
# deprecated.
343-
parser.add_option('--no-duplicate-basename-check',
343+
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345345
default=True, regenerate=False,
346346
help="don't check for duplicate basenames")
347-
parser.add_option('--no-parallel', action='store_true', default=False,
347+
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')
349-
parser.add_option('-S', '--suffix', dest='suffix', default='',
349+
parser.add_argument('-S', '--suffix', dest='suffix', default='',
350350
help='suffix to add to generated files')
351-
parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
351+
parser.add_argument('--toplevel-dir', dest='toplevel_dir', action='store',
352352
default=None, metavar='DIR', type='path',
353353
help='directory to use as the root of the source tree')
354-
parser.add_option('-R', '--root-target', dest='root_targets',
354+
parser.add_argument('-R', '--root-target', dest='root_targets',
355355
action='append', metavar='TARGET',
356356
help='include only TARGET and its deep dependencies')
357357

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 82f129d
Browse files
KiYugadgeterrvagg
KiYugadgeter
authored and
rvagg
committed
gyp: replace optparse to argparse
 * add_option with add_argument for argparse
* change methods methods of RegeneratableOptionParser to match argparse function name
PR-URL: #1591
Reviewed-By: cclauss <cclauss@me.com>
1 parent afaaa29 commit 82f129d
1 file changed
Lines changed: 29 additions & 29 deletions
File tree
‎gyp/pylib/gyp/__init__.py‎
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
importcopy
1010
importgyp.input
11-
importoptparse
11+
importargparse
1212
importos.path
1313
importre
1414
importshlex
@@ -244,15 +244,15 @@ def Noop(value):
244244

245245
returnflags
246246

247-
classRegeneratableOptionParser(optparse.OptionParser):
248-
def__init__(self):
247+
classRegeneratableOptionParser(argparse.ArgumentParser):
248+
def__init__(self, usage):
249249
self.__regeneratable_options= {}
250-
optparse.OptionParser.__init__(self)
250+
argparse.ArgumentParser.__init__(self, usage=usage)
251251

252-
defadd_option(self, *args, **kw):
252+
defadd_argument(self, *args, **kw):
253253
"""Add an option to the parser.
254254
255-
 This accepts the same arguments as OptionParser.add_option, plus the
255+
 This accepts the same arguments as ArgumentParser.add_argument, plus the
256256
 following:
257257
 regenerate: can be set to False to prevent this option from being included
258258
 in regeneration.
@@ -269,7 +269,7 @@ def add_option(self, *args, **kw):
269269
# it as a string.
270270
type=kw.get('type')
271271
iftype=='path':
272-
kw['type'] ='string'
272+
kw['type'] =str
273273

274274
self.__regeneratable_options[dest] = {
275275
'action': kw.get('action'),
@@ -278,50 +278,50 @@ def add_option(self, *args, **kw):
278278
'opt': args[0],
279279
 }
280280

281-
optparse.OptionParser.add_option(self, *args, **kw)
281+
argparse.ArgumentParser.add_argument(self, *args, **kw)
282282

283283
defparse_args(self, *args):
284-
values, args=optparse.OptionParser.parse_args(self, *args)
284+
values, args=argparse.ArgumentParser.parse_known_args(self, *args)
285285
values._regeneration_metadata=self.__regeneratable_options
286286
returnvalues, args
287287

288288
defgyp_main(args):
289289
my_name=os.path.basename(sys.argv[0])
290+
usage='usage: %(prog)s [options ...] [build_file ...]'
290291

291-
parser=RegeneratableOptionParser()
292-
usage='usage: %s [options ...] [build_file ...]'
293-
parser.set_usage(usage.replace('%s', '%prog'))
294-
parser.add_option('--build', dest='configs', action='append',
292+
293+
parser=RegeneratableOptionParser(usage=usage.replace('%s', '%(prog)s'))
294+
parser.add_argument('--build', dest='configs', action='append',
295295
help='configuration for build after project generation')
296-
parser.add_option('--check', dest='check', action='store_true',
296+
parser.add_argument('--check', dest='check', action='store_true',
297297
help='check format of gyp files')
298-
parser.add_option('--config-dir', dest='config_dir', action='store',
298+
parser.add_argument('--config-dir', dest='config_dir', action='store',
299299
env_name='GYP_CONFIG_DIR', default=None,
300300
help='The location for configuration files like '
301301
'include.gypi.')
302-
parser.add_option('-d', '--debug', dest='debug', metavar='DEBUGMODE',
302+
parser.add_argument('-d', '--debug', dest='debug', metavar='DEBUGMODE',
303303
action='append', default=[], help='turn on a debugging '
304304
'mode for debugging GYP. Supported modes are "variables", '
305305
'"includes" and "general" or "all" for all of them.')
306-
parser.add_option('-D', dest='defines', action='append', metavar='VAR=VAL',
306+
parser.add_argument('-D', dest='defines', action='append', metavar='VAR=VAL',
307307
env_name='GYP_DEFINES',
308308
help='sets variable VAR to value VAL')
309-
parser.add_option('--depth', dest='depth', metavar='PATH', type='path',
309+
parser.add_argument('--depth', dest='depth', metavar='PATH', type='path',
310310
help='set DEPTH gyp variable to a relative path to PATH')
311-
parser.add_option('-f', '--format', dest='formats', action='append',
311+
parser.add_argument('-f', '--format', dest='formats', action='append',
312312
env_name='GYP_GENERATORS', regenerate=False,
313313
help='output formats to generate')
314-
parser.add_option('-G', dest='generator_flags', action='append', default=[],
314+
parser.add_argument('-G', dest='generator_flags', action='append', default=[],
315315
metavar='FLAG=VAL', env_name='GYP_GENERATOR_FLAGS',
316316
help='sets generator flag FLAG to VAL')
317-
parser.add_option('--generator-output', dest='generator_output',
317+
parser.add_argument('--generator-output', dest='generator_output',
318318
action='store', default=None, metavar='DIR', type='path',
319319
env_name='GYP_GENERATOR_OUTPUT',
320320
help='puts generated build files under DIR')
321-
parser.add_option('--ignore-environment', dest='use_environment',
321+
parser.add_argument('--ignore-environment', dest='use_environment',
322322
action='store_false', default=True, regenerate=False,
323323
help='do not read options from environment variables')
324-
parser.add_option('-I', '--include', dest='includes', action='append',
324+
parser.add_argument('-I', '--include', dest='includes', action='append',
325325
metavar='INCLUDE', type='path',
326326
help='files to include in all loaded .gyp files')
327327
# --no-circular-check disables the check for circular relationships between
@@ -331,7 +331,7 @@ def gyp_main(args):
331331
# option allows the strict behavior to be used on Macs and the lenient
332332
# behavior to be used elsewhere.
333333
# TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
334-
parser.add_option('--no-circular-check', dest='circular_check',
334+
parser.add_argument('--no-circular-check', dest='circular_check',
335335
action='store_false', default=True, regenerate=False,
336336
help="don't check for circular relationships between files")
337337
# --no-duplicate-basename-check disables the check for duplicate basenames
@@ -340,18 +340,18 @@ def gyp_main(args):
340340
# when duplicate basenames are passed into Make generator on Mac.
341341
# TODO(yukawa): Remove this option when these legacy generators are
342342
# deprecated.
343-
parser.add_option('--no-duplicate-basename-check',
343+
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345345
default=True, regenerate=False,
346346
help="don't check for duplicate basenames")
347-
parser.add_option('--no-parallel', action='store_true', default=False,
347+
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')
349-
parser.add_option('-S', '--suffix', dest='suffix', default='',
349+
parser.add_argument('-S', '--suffix', dest='suffix', default='',
350350
help='suffix to add to generated files')
351-
parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
351+
parser.add_argument('--toplevel-dir', dest='toplevel_dir', action='store',
352352
default=None, metavar='DIR', type='path',
353353
help='directory to use as the root of the source tree')
354-
parser.add_option('-R', '--root-target', dest='root_targets',
354+
parser.add_argument('-R', '--root-target', dest='root_targets',
355355
action='append', metavar='TARGET',
356356
help='include only TARGET and its deep dependencies')
357357

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 82f129d
Browse files
KiYugadgeterrvagg
KiYugadgeter
authored and
rvagg
committed
gyp: replace optparse to argparse
 * add_option with add_argument for argparse
* change methods methods of RegeneratableOptionParser to match argparse function name
PR-URL: #1591
Reviewed-By: cclauss <cclauss@me.com>
1 parent afaaa29 commit 82f129d
1 file changed
Lines changed: 29 additions & 29 deletions
File tree
‎gyp/pylib/gyp/__init__.py‎
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
importcopy
1010
importgyp.input
11-
importoptparse
11+
importargparse
1212
importos.path
1313
importre
1414
importshlex
@@ -244,15 +244,15 @@ def Noop(value):
244244

245245
returnflags
246246

247-
classRegeneratableOptionParser(optparse.OptionParser):
248-
def__init__(self):
247+
classRegeneratableOptionParser(argparse.ArgumentParser):
248+
def__init__(self, usage):
249249
self.__regeneratable_options= {}
250-
optparse.OptionParser.__init__(self)
250+
argparse.ArgumentParser.__init__(self, usage=usage)
251251

252-
defadd_option(self, *args, **kw):
252+
defadd_argument(self, *args, **kw):
253253
"""Add an option to the parser.
254254
255-
 This accepts the same arguments as OptionParser.add_option, plus the
255+
 This accepts the same arguments as ArgumentParser.add_argument, plus the
256256
 following:
257257
 regenerate: can be set to False to prevent this option from being included
258258
 in regeneration.
@@ -269,7 +269,7 @@ def add_option(self, *args, **kw):
269269
# it as a string.
270270
type=kw.get('type')
271271
iftype=='path':
272-
kw['type'] ='string'
272+
kw['type'] =str
273273

274274
self.__regeneratable_options[dest] = {
275275
'action': kw.get('action'),
@@ -278,50 +278,50 @@ def add_option(self, *args, **kw):
278278
'opt': args[0],
279279
 }
280280

281-
optparse.OptionParser.add_option(self, *args, **kw)
281+
argparse.ArgumentParser.add_argument(self, *args, **kw)
282282

283283
defparse_args(self, *args):
284-
values, args=optparse.OptionParser.parse_args(self, *args)
284+
values, args=argparse.ArgumentParser.parse_known_args(self, *args)
285285
values._regeneration_metadata=self.__regeneratable_options
286286
returnvalues, args
287287

288288
defgyp_main(args):
289289
my_name=os.path.basename(sys.argv[0])
290+
usage='usage: %(prog)s [options ...] [build_file ...]'
290291

291-
parser=RegeneratableOptionParser()
292-
usage='usage: %s [options ...] [build_file ...]'
293-
parser.set_usage(usage.replace('%s', '%prog'))
294-
parser.add_option('--build', dest='configs', action='append',
292+
293+
parser=RegeneratableOptionParser(usage=usage.replace('%s', '%(prog)s'))
294+
parser.add_argument('--build', dest='configs', action='append',
295295
help='configuration for build after project generation')
296-
parser.add_option('--check', dest='check', action='store_true',
296+
parser.add_argument('--check', dest='check', action='store_true',
297297
help='check format of gyp files')
298-
parser.add_option('--config-dir', dest='config_dir', action='store',
298+
parser.add_argument('--config-dir', dest='config_dir', action='store',
299299
env_name='GYP_CONFIG_DIR', default=None,
300300
help='The location for configuration files like '
301301
'include.gypi.')
302-
parser.add_option('-d', '--debug', dest='debug', metavar='DEBUGMODE',
302+
parser.add_argument('-d', '--debug', dest='debug', metavar='DEBUGMODE',
303303
action='append', default=[], help='turn on a debugging '
304304
'mode for debugging GYP. Supported modes are "variables", '
305305
'"includes" and "general" or "all" for all of them.')
306-
parser.add_option('-D', dest='defines', action='append', metavar='VAR=VAL',
306+
parser.add_argument('-D', dest='defines', action='append', metavar='VAR=VAL',
307307
env_name='GYP_DEFINES',
308308
help='sets variable VAR to value VAL')
309-
parser.add_option('--depth', dest='depth', metavar='PATH', type='path',
309+
parser.add_argument('--depth', dest='depth', metavar='PATH', type='path',
310310
help='set DEPTH gyp variable to a relative path to PATH')
311-
parser.add_option('-f', '--format', dest='formats', action='append',
311+
parser.add_argument('-f', '--format', dest='formats', action='append',
312312
env_name='GYP_GENERATORS', regenerate=False,
313313
help='output formats to generate')
314-
parser.add_option('-G', dest='generator_flags', action='append', default=[],
314+
parser.add_argument('-G', dest='generator_flags', action='append', default=[],
315315
metavar='FLAG=VAL', env_name='GYP_GENERATOR_FLAGS',
316316
help='sets generator flag FLAG to VAL')
317-
parser.add_option('--generator-output', dest='generator_output',
317+
parser.add_argument('--generator-output', dest='generator_output',
318318
action='store', default=None, metavar='DIR', type='path',
319319
env_name='GYP_GENERATOR_OUTPUT',
320320
help='puts generated build files under DIR')
321-
parser.add_option('--ignore-environment', dest='use_environment',
321+
parser.add_argument('--ignore-environment', dest='use_environment',
322322
action='store_false', default=True, regenerate=False,
323323
help='do not read options from environment variables')
324-
parser.add_option('-I', '--include', dest='includes', action='append',
324+
parser.add_argument('-I', '--include', dest='includes', action='append',
325325
metavar='INCLUDE', type='path',
326326
help='files to include in all loaded .gyp files')
327327
# --no-circular-check disables the check for circular relationships between
@@ -331,7 +331,7 @@ def gyp_main(args):
331331
# option allows the strict behavior to be used on Macs and the lenient
332332
# behavior to be used elsewhere.
333333
# TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
334-
parser.add_option('--no-circular-check', dest='circular_check',
334+
parser.add_argument('--no-circular-check', dest='circular_check',
335335
action='store_false', default=True, regenerate=False,
336336
help="don't check for circular relationships between files")
337337
# --no-duplicate-basename-check disables the check for duplicate basenames
@@ -340,18 +340,18 @@ def gyp_main(args):
340340
# when duplicate basenames are passed into Make generator on Mac.
341341
# TODO(yukawa): Remove this option when these legacy generators are
342342
# deprecated.
343-
parser.add_option('--no-duplicate-basename-check',
343+
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345345
default=True, regenerate=False,
346346
help="don't check for duplicate basenames")
347-
parser.add_option('--no-parallel', action='store_true', default=False,
347+
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')
349-
parser.add_option('-S', '--suffix', dest='suffix', default='',
349+
parser.add_argument('-S', '--suffix', dest='suffix', default='',
350350
help='suffix to add to generated files')
351-
parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
351+
parser.add_argument('--toplevel-dir', dest='toplevel_dir', action='store',
352352
default=None, metavar='DIR', type='path',
353353
help='directory to use as the root of the source tree')
354-
parser.add_option('-R', '--root-target', dest='root_targets',
354+
parser.add_argument('-R', '--root-target', dest='root_targets',
355355
action='append', metavar='TARGET',
356356
help='include only TARGET and its deep dependencies')
357357

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 82f129d
Browse files
KiYugadgeterrvagg
KiYugadgeter
authored and
rvagg
committed
gyp: replace optparse to argparse
 * add_option with add_argument for argparse
* change methods methods of RegeneratableOptionParser to match argparse function name
PR-URL: #1591
Reviewed-By: cclauss <cclauss@me.com>
1 parent afaaa29 commit 82f129d
1 file changed
Lines changed: 29 additions & 29 deletions
File tree
‎gyp/pylib/gyp/__init__.py‎
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
importcopy
1010
importgyp.input
11-
importoptparse
11+
importargparse
1212
importos.path
1313
importre
1414
importshlex
@@ -244,15 +244,15 @@ def Noop(value):
244244

245245
returnflags
246246

247-
classRegeneratableOptionParser(optparse.OptionParser):
248-
def__init__(self):
247+
classRegeneratableOptionParser(argparse.ArgumentParser):
248+
def__init__(self, usage):
249249
self.__regeneratable_options= {}
250-
optparse.OptionParser.__init__(self)
250+
argparse.ArgumentParser.__init__(self, usage=usage)
251251

252-
defadd_option(self, *args, **kw):
252+
defadd_argument(self, *args, **kw):
253253
"""Add an option to the parser.
254254
255-
 This accepts the same arguments as OptionParser.add_option, plus the
255+
 This accepts the same arguments as ArgumentParser.add_argument, plus the
256256
 following:
257257
 regenerate: can be set to False to prevent this option from being included
258258
 in regeneration.
@@ -269,7 +269,7 @@ def add_option(self, *args, **kw):
269269
# it as a string.
270270
type=kw.get('type')
271271
iftype=='path':
272-
kw['type'] ='string'
272+
kw['type'] =str
273273

274274
self.__regeneratable_options[dest] = {
275275
'action': kw.get('action'),
@@ -278,50 +278,50 @@ def add_option(self, *args, **kw):
278278
'opt': args[0],
279279
 }
280280

281-
optparse.OptionParser.add_option(self, *args, **kw)
281+
argparse.ArgumentParser.add_argument(self, *args, **kw)
282282

283283
defparse_args(self, *args):
284-
values, args=optparse.OptionParser.parse_args(self, *args)
284+
values, args=argparse.ArgumentParser.parse_known_args(self, *args)
285285
values._regeneration_metadata=self.__regeneratable_options
286286
returnvalues, args
287287

288288
defgyp_main(args):
289289
my_name=os.path.basename(sys.argv[0])
290+
usage='usage: %(prog)s [options ...] [build_file ...]'
290291

291-
parser=RegeneratableOptionParser()
292-
usage='usage: %s [options ...] [build_file ...]'
293-
parser.set_usage(usage.replace('%s', '%prog'))
294-
parser.add_option('--build', dest='configs', action='append',
292+
293+
parser=RegeneratableOptionParser(usage=usage.replace('%s', '%(prog)s'))
294+
parser.add_argument('--build', dest='configs', action='append',
295295
help='configuration for build after project generation')
296-
parser.add_option('--check', dest='check', action='store_true',
296+
parser.add_argument('--check', dest='check', action='store_true',
297297
help='check format of gyp files')
298-
parser.add_option('--config-dir', dest='config_dir', action='store',
298+
parser.add_argument('--config-dir', dest='config_dir', action='store',
299299
env_name='GYP_CONFIG_DIR', default=None,
300300
help='The location for configuration files like '
301301
'include.gypi.')
302-
parser.add_option('-d', '--debug', dest='debug', metavar='DEBUGMODE',
302+
parser.add_argument('-d', '--debug', dest='debug', metavar='DEBUGMODE',
303303
action='append', default=[], help='turn on a debugging '
304304
'mode for debugging GYP. Supported modes are "variables", '
305305
'"includes" and "general" or "all" for all of them.')
306-
parser.add_option('-D', dest='defines', action='append', metavar='VAR=VAL',
306+
parser.add_argument('-D', dest='defines', action='append', metavar='VAR=VAL',
307307
env_name='GYP_DEFINES',
308308
help='sets variable VAR to value VAL')
309-
parser.add_option('--depth', dest='depth', metavar='PATH', type='path',
309+
parser.add_argument('--depth', dest='depth', metavar='PATH', type='path',
310310
help='set DEPTH gyp variable to a relative path to PATH')
311-
parser.add_option('-f', '--format', dest='formats', action='append',
311+
parser.add_argument('-f', '--format', dest='formats', action='append',
312312
env_name='GYP_GENERATORS', regenerate=False,
313313
help='output formats to generate')
314-
parser.add_option('-G', dest='generator_flags', action='append', default=[],
314+
parser.add_argument('-G', dest='generator_flags', action='append', default=[],
315315
metavar='FLAG=VAL', env_name='GYP_GENERATOR_FLAGS',
316316
help='sets generator flag FLAG to VAL')
317-
parser.add_option('--generator-output', dest='generator_output',
317+
parser.add_argument('--generator-output', dest='generator_output',
318318
action='store', default=None, metavar='DIR', type='path',
319319
env_name='GYP_GENERATOR_OUTPUT',
320320
help='puts generated build files under DIR')
321-
parser.add_option('--ignore-environment', dest='use_environment',
321+
parser.add_argument('--ignore-environment', dest='use_environment',
322322
action='store_false', default=True, regenerate=False,
323323
help='do not read options from environment variables')
324-
parser.add_option('-I', '--include', dest='includes', action='append',
324+
parser.add_argument('-I', '--include', dest='includes', action='append',
325325
metavar='INCLUDE', type='path',
326326
help='files to include in all loaded .gyp files')
327327
# --no-circular-check disables the check for circular relationships between
@@ -331,7 +331,7 @@ def gyp_main(args):
331331
# option allows the strict behavior to be used on Macs and the lenient
332332
# behavior to be used elsewhere.
333333
# TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
334-
parser.add_option('--no-circular-check', dest='circular_check',
334+
parser.add_argument('--no-circular-check', dest='circular_check',
335335
action='store_false', default=True, regenerate=False,
336336
help="don't check for circular relationships between files")
337337
# --no-duplicate-basename-check disables the check for duplicate basenames
@@ -340,18 +340,18 @@ def gyp_main(args):
340340
# when duplicate basenames are passed into Make generator on Mac.
341341
# TODO(yukawa): Remove this option when these legacy generators are
342342
# deprecated.
343-
parser.add_option('--no-duplicate-basename-check',
343+
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345345
default=True, regenerate=False,
346346
help="don't check for duplicate basenames")
347-
parser.add_option('--no-parallel', action='store_true', default=False,
347+
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')
349-
parser.add_option('-S', '--suffix', dest='suffix', default='',
349+
parser.add_argument('-S', '--suffix', dest='suffix', default='',
350350
help='suffix to add to generated files')
351-
parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
351+
parser.add_argument('--toplevel-dir', dest='toplevel_dir', action='store',
352352
default=None, metavar='DIR', type='path',
353353
help='directory to use as the root of the source tree')
354-
parser.add_option('-R', '--root-target', dest='root_targets',
354+
parser.add_argument('-R', '--root-target', dest='root_targets',
355355
action='append', metavar='TARGET',
356356
help='include only TARGET and its deep dependencies')
357357

0 commit comments
Comments
 (0)