Attachment 292102 Details for Bug 427480 – patch to upstream tarball

patch to upstream tarball

nooption.patch (text/x-patch), 3.32 KB, created by Parag AN(पराग) on 2008-01-18 03:14:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Parag AN(पराग)

Created: 2008-01-18 03:14:53 UTC

Size: 3.32 KB

patch

obsolete

>diff -urN XML-TreeBuilder-3.09/Changes XML-TreeBuilder-3.10/Changes
>--- XML-TreeBuilder-3.09/Changes	2004-06-11 09:58:41.000000000 +0530
>+++ XML-TreeBuilder-3.10/Changes	2007-12-12 05:08:27.000000000 +0530
>@@ -1,5 +1,11 @@
> # Time-stamp: "2004-06-10 20:28:41 ADT"
> 
>+2007-12-01   Jeff Fearn <jfearn@redhat.com>
>+
>+   Release 3.12
>+
>+   Added NoExpand option to allow entities to be left untouched in xml.
>+
> 
> 2004-06-10   Sean M. Burke <sburke@cpan.org>
> 
>diff -urN XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-3.10/lib/XML/TreeBuilder.pm
>--- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm	2004-06-11 09:29:14.000000000 +0530
>+++ XML-TreeBuilder-3.10/lib/XML/TreeBuilder.pm	2007-12-12 06:07:03.000000000 +0530
>@@ -5,27 +5,41 @@
> use strict;
> use XML::Element ();
> use XML::Parser ();
>+use Carp;
> use vars qw(@ISA $VERSION);
> 
>-$VERSION = '3.09';
>+$VERSION = '3.10';
> @ISA = ('XML::Element');
> 
> #==========================================================================
> sub new {
>-  my $class = ref($_[0]) || $_[0];
>-  # that's the only parameter it knows
>+  my ($this, $arg) = @_;
>+  my $class = ref($this) || $this;
>+
>+  my $NoExpand = defined $arg->{'NoExpand'} ? delete $arg->{'NoExpand'} : 0;
>+
>+  if ( %{$arg} ) {
>+    croak "unknown args: " . join( ", ", keys %{$arg} );
>+  }
>   
>   my $self = XML::Element->new('NIL');
>   bless $self, $class; # and rebless
>-  $self->{'_element_class'} = 'XML::Element';
>+  $self->{'_element_class'}      = 'XML::Element';
>   $self->{'_store_comments'}     = 0;
>   $self->{'_store_pis'}          = 0;
>   $self->{'_store_declarations'} = 0;
>+  $self->{'NoExpand'}            = $NoExpand;
>   
>   my @stack;
>   # Compare the simplicity of this to the sheer nastiness of HTML::TreeBuilder!
>   
>   $self->{'_xml_parser'} = XML::Parser->new( 'Handlers' => {
>+    'Default' => sub {
>+        if ( ( $self->{'NoExpand'} ) && ( $_[1] =~ /&.*\;/ ) ) {
>+            $stack[-1]->push_content( $_[1] );
>+        }
>+        return;
>+    },
>     'Start' => sub {
>       shift;
>       if(@stack) {
>@@ -103,7 +117,8 @@
>        return;
>     },
>     
>-  });
>+  },
>+  'NoExpand' => $self->{'NoExpand'});
>   
>   return $self;
> }
>diff -urN XML-TreeBuilder-3.09/META.yml XML-TreeBuilder-3.10/META.yml
>--- XML-TreeBuilder-3.09/META.yml	2004-06-11 09:58:56.000000000 +0530
>+++ XML-TreeBuilder-3.10/META.yml	2008-01-17 08:55:15.000000000 +0530
>@@ -1,7 +1,7 @@
> # http://module-build.sourceforge.net/META-spec.html
> #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
> name:         XML-TreeBuilder
>-version:      3.09
>+version:      3.10
> version_from: lib/XML/TreeBuilder.pm
> installdirs:  site
> requires:
>@@ -10,4 +10,4 @@
>     XML::Parser:                   0
> 
> distribution_type: module
>-generated_by: ExtUtils::MakeMaker version 6.17
>+generated_by: ExtUtils::MakeMaker version 6.30
>diff -urN XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-3.10/t/10main.t
>--- XML-TreeBuilder-3.09/t/10main.t	2004-06-11 09:52:53.000000000 +0530
>+++ XML-TreeBuilder-3.10/t/10main.t	2008-01-17 08:54:55.000000000 +0530
>@@ -20,7 +20,7 @@
> );
> 
> my $y = XML::Element->new_from_lol(
>- ['Gee',
>+ ['Gee', { 'NoExpand' => '0'},
>    ['~comment', {'text' => ' myorp '}],
>    ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'],
>    ['lor'],
>@@ -29,8 +29,7 @@
>  ]
> );
> 
>-
>-ok $x->same_as($y);
>+ok($x->same_as($y));
> 
> unless( $ENV{'HARNESS_ACTIVE'} ) {
>   $x->dump;

Actions: View

Attachments on bug 427480: 292102