@@ -1,5 +1,13 @@
 Revision history for URI
 
+2014-11-05   Karen Etheridge <ether@cpan.org>
+
+  Release 1.65
+
+  Karen Etheridge:
+    - add a TO_JSON method, to assist JSON serialization
+
+
 2014-07-13   Karen Etheridge <ether@cpan.org>
 
   Release 1.64

@@ -4,7 +4,7 @@
       "Gisle Aas <gisle@activestate.com>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "ExtUtils::MakeMaker version 6.9904, CPAN::Meta::Converter version 2.141520",
+   "generated_by" : "ExtUtils::MakeMaker version 7, CPAN::Meta::Converter version 2.142690",
    "license" : [
       "perl_5"
    ],
@@ -32,6 +32,7 @@
          "requires" : {
             "Exporter" : "5.57",
             "MIME::Base64" : "2",
+            "Scalar::Util" : "0",
             "parent" : "0",
             "perl" : "5.008001",
             "utf8" : "0"
@@ -58,5 +59,5 @@
       },
       "x_MailingList" : "mailto:libwww@perl.org"
    },
-   "version" : "1.64"
+   "version" : "1.65"
 }

@@ -9,7 +9,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: '0'
 dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.9904, CPAN::Meta::Converter version 2.141520'
+generated_by: 'ExtUtils::MakeMaker version 7, CPAN::Meta::Converter version 2.142690'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,6 +24,7 @@ recommends:
 requires:
   Exporter: '5.57'
   MIME::Base64: '2'
+  Scalar::Util: '0'
   parent: '0'
   perl: '5.008001'
   utf8: '0'
@@ -31,4 +32,4 @@ resources:
   MailingList: mailto:libwww@perl.org
   bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=URI
   repository: https://github.com/libwww-perl/uri.git
-version: '1.64'
+version: '1.65'

@@ -11,7 +11,7 @@ my %WriteMakefileArgs = (
     VERSION_FROM        => 'URI.pm',
     ABSTRACT_FROM       => 'URI.pm',
     AUTHOR              => 'Gisle Aas <gisle@activestate.com>',
-    LICENSE             => 'perl',
+    LICENSE             => 'perl_5',
 
     META_MERGE => {
         'meta-spec' => { version => 2 },
@@ -43,6 +43,7 @@ my %WriteMakefileArgs = (
                     'parent'        => '0',
                     'Exporter'      => '5.57',
                     'utf8'          => '0',
+                    'Scalar::Util'  => '0',
                     'perl'          => '5.008001',
                 },
                 recommends => {

@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use URI;
+use Scalar::Util 'blessed';
 
 our $VERSION = "2.20";
 
@@ -15,7 +16,7 @@ sub new
 {
     my($class, $uri, $base) = @_;
     my $ibase = $base;
-    if ($base && ref($base) && UNIVERSAL::isa($base, __PACKAGE__)) {
+    if ($base && blessed($base) && $base->isa(__PACKAGE__)) {
 	$base = $base->abs;
 	$ibase = $base->[0];
     }
@@ -39,7 +40,7 @@ sub _init
 sub eq
 {
     my($self, $other) = @_;
-    $other = $other->[0] if UNIVERSAL::isa($other, __PACKAGE__);
+    $other = $other->[0] if blessed($other) and $other->isa(__PACKAGE__);
     $self->[0]->eq($other);
 }
 

@@ -7,7 +7,7 @@ package URI::_ldap;
 use strict;
 use warnings;
 
-our $VERSION = "1.64";
+our $VERSION = "1.65";
 
 use URI::Escape qw(uri_unescape);
 

@@ -3,7 +3,7 @@ package URI::_punycode;
 use strict;
 use warnings;
 
-our $VERSION = "1.64";
+our $VERSION = "1.65";
 
 use Exporter 'import';
 our @EXPORT = qw(encode_punycode decode_punycode);

@@ -5,7 +5,7 @@ use warnings;
 
 use parent 'URI';
 
-our $VERSION = '1.64';
+our $VERSION = '1.65';
 
 use MIME::Base64 qw(encode_base64 decode_base64);
 use URI::Escape  qw(uri_unescape);

@@ -7,7 +7,7 @@ package URI::ldap;
 use strict;
 use warnings;
 
-our $VERSION = "1.64";
+our $VERSION = "1.65";
 
 use parent qw(URI::_ldap URI::_server);
 

@@ -14,7 +14,7 @@ use parent qw(URI::_server URI::_userpass);
 
 use URI::Escape qw(uri_unescape);
 
-our $VERSION = "1.64";
+our $VERSION = "1.65";
 
 sub default_port { 5060 }
 

@@ -3,7 +3,7 @@ package URI;
 use strict;
 use warnings;
 
-our $VERSION = "1.64";
+our $VERSION = "1.65";
 
 our ($ABS_REMOTE_LEADING_DOTS, $ABS_ALLOW_RELATIVE_SCHEME, $DEFAULT_QUERY_FORM_DELIMITER);
 
@@ -155,6 +155,7 @@ sub clone
     bless \$other, ref $self;
 }
 
+sub TO_JSON { ${$_[0]} }
 
 sub _no_scheme_ok { 0 }
 

@@ -18,8 +18,8 @@ use URI::IRI;
 
 my $u;
 
-binmode Test::More->builder->output, ":utf8";
-binmode Test::More->builder->failure_output, ":utf8";
+binmode Test::More->builder->output, ':encoding(UTF-8)';
+binmode Test::More->builder->failure_output, ':encoding(UTF-8)';
 
 $u = URI->new("http://Bücher.ch");
 is $u, "http://xn--bcher-kva.ch";