wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-11-30 19:04:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "FancyCaptcha: Remove deprecated blacklist parameter"

Browse source
This commit is contained in:
jenkins-bot 2024-01-29 16:43:36 +00:00 committed by Gerrit Code Review
parent b0227d4ab7 cbbe6611b4
commit 578a11b779
3 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
captcha-old.py
View file

@ -291,12 +291,6 @@ if __name__ == "__main__":
metavar="FILE", metavar="FILE",
default=os.path.join(script_dir, "badwordlist"), default=os.path.join(script_dir, "badwordlist"),
) )
parser.add_option(
"--blacklist",
help="DEPRECATED: list of words that should not be used",
metavar="FILE",
default=os.path.join(script_dir, "blacklist"),
)
parser.add_option( parser.add_option(
"--fill", "--fill",
help="Fill the output directory to contain N files, overrides count, cannot be used with --dirs", help="Fill the output directory to contain N files, overrides count, cannot be used with --dirs",
@ -358,7 +352,7 @@ if __name__ == "__main__":
else: else:
sys.exit("Need to specify the location of a font") sys.exit("Need to specify the location of a font")
badwordlist = read_wordlist(opts.blacklist) + read_wordlist(opts.badwordlist) badwordlist = read_wordlist(opts.badwordlist)
count = opts.count count = opts.count
fill = opts.fill fill = opts.fill
fontsize = opts.font_size fontsize = opts.font_size

8
captcha.py
View file

@ -321,12 +321,6 @@ if __name__ == "__main__":
metavar="FILE", metavar="FILE",
default=os.path.join(script_dir, "badwordlist"), default=os.path.join(script_dir, "badwordlist"),
) )
parser.add_option(
"--blacklist",
help="DEPRECATED: list of words that should not be used",
metavar="FILE",
default=os.path.join(script_dir, "blacklist"),
)
parser.add_option( parser.add_option(
"--fill", "--fill",
help="Fill the output directory to contain N files, overrides count, cannot be used with --dirs", help="Fill the output directory to contain N files, overrides count, cannot be used with --dirs",
@ -388,7 +382,7 @@ if __name__ == "__main__":
else: else:
sys.exit("Need to specify the location of a font") sys.exit("Need to specify the location of a font")
badwordlist = read_wordlist(opts.blacklist) + read_wordlist(opts.badwordlist) badwordlist = read_wordlist(opts.badwordlist)
count = opts.count count = opts.count
fill = opts.fill fill = opts.fill
fontsize = opts.font_size fontsize = opts.font_size

3
maintenance/GenerateFancyCaptchas.php
View file

@ -48,7 +48,6 @@ class GenerateFancyCaptchas extends Maintenance {
$this->addOption( "font", "The font to use", true, true ); $this->addOption( "font", "The font to use", true, true );
$this->addOption( "font-size", "The font size ", false, true ); $this->addOption( "font-size", "The font size ", false, true );
$this->addOption( "badwordlist", "A list of words that should not be used", false, true ); $this->addOption( "badwordlist", "A list of words that should not be used", false, true );
$this->addOption( "blacklist", "DEPRECATED: A list of words that should not be used", false, true );
$this->addOption( "fill", "Fill the captcha container to N files", true, true ); $this->addOption( "fill", "Fill the captcha container to N files", true, true );
$this->addOption( $this->addOption(
"verbose", "verbose",
@ -128,7 +127,7 @@ class GenerateFancyCaptchas extends Maintenance {
$wgCaptchaDirectoryLevels $wgCaptchaDirectoryLevels
]; ];
foreach ( foreach (
[ 'wordlist', 'font', 'font-size', 'blacklist', 'badwordlist', 'verbose', 'threads' ] as $par [ 'wordlist', 'font', 'font-size', 'badwordlist', 'verbose', 'threads' ] as $par
) { ) {
if ( $this->hasOption( $par ) ) { if ( $this->hasOption( $par ) ) {
$cmd[] = "--$par"; $cmd[] = "--$par";