From a9aa4ee0a89b23354254dd7fcf171acc61cbef4b Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Tue, 29 Oct 2013 11:26:31 -0400
Subject: nope, i was wrong

---
 lib/Spreadsheet/Template/Helpers/Xslate.pm | 10 ++--------
 t/data/utf8.json                           |  4 ++--
 t/utf8.t                                   |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/Spreadsheet/Template/Helpers/Xslate.pm b/lib/Spreadsheet/Template/Helpers/Xslate.pm
index a05ff0a..56df981 100644
--- a/lib/Spreadsheet/Template/Helpers/Xslate.pm
+++ b/lib/Spreadsheet/Template/Helpers/Xslate.pm
@@ -2,7 +2,6 @@ package Spreadsheet::Template::Helpers::Xslate;
 use strict;
 use warnings;
 
-use Encode;
 use JSON;
 
 my $JSON = JSON->new;
@@ -11,10 +10,10 @@ use Sub::Exporter 'build_exporter';
 
 my $import = build_exporter({
     exports => [
-        map { $_ => \&_curry_package } qw(format c merge true false u)
+        map { $_ => \&_curry_package } qw(format c merge true false)
     ],
     groups => {
-        default => [qw(format c merge true false u)],
+        default => [qw(format c merge true false)],
     },
 });
 
@@ -66,11 +65,6 @@ sub merge {
 sub true  { JSON::true  }
 sub false { JSON::false }
 
-sub u {
-    my ($package, $str) = @_;
-    return Encode::decode('UTF-8', $str, Encode::FB_CROAK)
-}
-
 sub _parse_range {
     my ($range) = @_;
 
diff --git a/t/data/utf8.json b/t/data/utf8.json
index c65a4bc..1471bae 100644
--- a/t/data/utf8.json
+++ b/t/data/utf8.json
@@ -1,10 +1,10 @@
 %% my $default = { color => '#000000', size => 14 };
 %% format(normal     => $default.merge({}));
 %% format(date       => $default.merge({ num_format => 'd-mmm' }));
-%% format(money      => $default.merge({ bold       => true(),    num_format => u('_(¥* #,##0.00_);_(¥* (#,##0.00);_(¥* -??_);_(@_)')}));
+%% format(money      => $default.merge({ bold       => true(),    num_format => '_(¥* #,##0.00_);_(¥* (#,##0.00);_(¥* -??_);_(@_)'}));
 %% format(title      => $default.merge({ bg_color   => '#c6d9f0', pattern    => 'solid' }));
 %% format(bold       => $default.merge({ bold       => true() }));
-%% format(bold_money => $default.merge({ bold       => true(),    num_format => u('_(¥* #,##0.00_);_(¥* (#,##0.00);_(¥* -??_);_(@_)')}));
+%% format(bold_money => $default.merge({ bold       => true(),    num_format => '_(¥* #,##0.00_);_(¥* (#,##0.00);_(¥* -??_);_(@_)'}));
 {
    "selection"  : 0,
    "worksheets" : [
diff --git a/t/utf8.t b/t/utf8.t
index 03c72d8..50bafba 100644
--- a/t/utf8.t
+++ b/t/utf8.t
@@ -9,7 +9,7 @@ use Spreadsheet::ParseXLSX;
 use Spreadsheet::Template;
 
 my $template = Spreadsheet::Template->new;
-my $data = do { local $/; local @ARGV = ('t/data/utf8.json'); <> };
+my $data = do { open my $fh, '<:encoding(UTF-8)', 't/data/utf8.json'; local $/; <$fh> };
 {
     my $excel = $template->render(
         $data,
-- 
cgit v1.2.3-54-g00ecf