This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 2fd17a5c35f7d08c75a4919baac0f5d58c2e7079 Author: James McCoy <[email protected]> Date: Mon May 25 00:24:30 2015 -0400 Remove unused Devscripts::URI module The upstream URI module has supported ; as a delimiter since version 1.37 (in 2008). We never actually made changes to use our custom module, but any such changes can now safely use the upstream version. Signed-off-by: James McCoy <[email protected]> --- lib/Devscripts/URI.pm | 106 -------------------------------------------------- 1 file changed, 106 deletions(-) diff --git a/lib/Devscripts/URI.pm b/lib/Devscripts/URI.pm deleted file mode 100644 index 49a4c7a..0000000 --- a/lib/Devscripts/URI.pm +++ /dev/null @@ -1,106 +0,0 @@ -# This module is stolen from debbugs until the real -# URI::query_form properly handles ; and is released -# under the terms of the GPL version 2, or any later -# version at your option. -# See the file README and COPYING for more information. -# -# Copyright 2007 by Don Armstrong <[email protected]>. -# query_form is -# Copyright 1995-2003 Gisle Aas. -# Copyright 1995 Martijn Koster. - - -package Devscripts::URI; - -=head1 NAME - -Devscripts::URI -- Derivative of URI which overrides the query_param - method to use ';' instead of '&' for separators. - -=head1 SYNOPSIS - -use Devscripts::URI; - -=head1 DESCRIPTION - -See L<URI> for more information. - -=head1 BUGS - -None known. - -=cut - -use warnings; -use strict; -use base qw(URI URI::_query); - -=head2 query_param - - $uri->query_form( $key1 => $val1, $key2 => $val2, ... ) - -Exactly like query_param in L<URI> except query elements are joined by -; instead of &. - -=cut - -{ - - package URI::_query; - - no warnings 'redefine'; - # Handle ...?foo=bar&bar=foo type of query - sub URI::_query::query_form { - my $self = shift; - my $old = $self->query; - if (@_) { - # Try to set query string - my @new = @_; - if (@new == 1) { - my $n = $new[0]; - if (ref($n) eq "ARRAY") { - @new = @$n; - } - elsif (ref($n) eq "HASH") { - @new = %$n; - } - } - my @query; - while (my($key,$vals) = splice(@new, 0, 2)) { - $key = '' unless defined $key; - $key =~ s/([;\/?:@&=+,\$\[\]%])/$URI::Escape::escapes{$1}/g; - $key =~ s/ /+/g; - $vals = [ref($vals) eq "ARRAY" ? @$vals : $vals]; - for my $val (@$vals) { - $val = '' unless defined $val; - $val =~ s/([;\/?:@&=+,\$\[\]%])/$URI::Escape::escapes{$1}/g; - $val =~ s/ /+/g; - push(@query, "$key=$val"); - } - } - # We've changed & to a ; here. - $self->query(@query ? join(';', @query) : undef); - } - return if !defined($old) || !length($old) || !defined(wantarray); - return unless $old =~ /=/; # not a form - map { s/\+/ /g; uri_unescape($_) } - # We've also changed the split here to split on ; as well as & - map { /=/ ? split(/=/, $_, 2) : ($_ => '')} split(/[&;]/, $old); - } -} - - - - - - -1; - - -__END__ - - - - - - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
