Merge remote-tracking branch 'upstream/pull/3380'

[rails.git] / script / misc / update-wiki-pages

diff --git a/script/misc/update-wiki-pages b/script/misc/update-wiki-pages
index 0bef30d03f113de844f19e0b4f3bc2d860db6480..3f15c0df0a7f69991c17799d2b947a365c8d4b00 100755 (executable)
--- a/script/misc/update-wiki-pages
+++ b/script/misc/update-wiki-pages
@@ -3,20 +3,11 @@ use 5.010;
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use Pod::Usage ();
-use Getopt::Long ();
-
-BEGIN {
-    eval "require MediaWiki::API; require YAML::XS;" or do {
-        print "You have to install some modules via CPAN to run this:\n";
-        print "   sudo cpanp MediaWiki::API YAML::XS\n";
-        exit 1;
-    };
-}
-
+use Getopt::Long;
+use Pod::Usage;

 use MediaWiki::API;
 use MediaWiki::API;

+use Test::More qw(no_plan);

 use YAML::XS qw(Dump);
 use YAML::XS qw(Dump);

-use Test::More 'no_plan';

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -50,7 +41,7 @@ help() unless -f $out_file;
 # Get a API interface
 my $mw = MediaWiki::API->new();
 ok($mw, "Got a MediaWiki API");
 # Get a API interface
 my $mw = MediaWiki::API->new();
 ok($mw, "Got a MediaWiki API");

-$mw->{config}->{api_url} = 'http://wiki.openstreetmap.org/w/api.php';
+$mw->{config}->{api_url} = 'https://wiki.openstreetmap.org/w/api.php';

 
 # All our goodies
 my (%feature, %count);
 
 # All our goodies
 my (%feature, %count);