[interchange-cvs] interchange - heins modified lib/Vend/File.pm

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2009-04-29 05:08:13 GMT
Modified:  lib/Vend File.pm
Log:
* Remove namespace problems introduced with Vend::File calling Encode::PERLQQ when
  module is not "used".

Revision  Changes    Path
2.32                 interchange/lib/Vend/File.pm


rev 2.32, prev_rev 2.31
Index: File.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/File.pm,v
retrieving revision 2.31
retrieving revision 2.32
diff -u -r2.31 -r2.32
--- File.pm	27 Apr 2009 10:00:17 -0000	2.31
+++ File.pm	29 Apr 2009 05:08:13 -0000	2.32
@@ -1,6 +1,6 @@
 # Vend::File - Interchange file functions
 #
-# $Id: File.pm,v 2.31 2009-04-27 10:00:17 racke Exp $
+# $Id: File.pm,v 2.32 2009-04-29 05:08:13 mheins Exp $
 # 
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -61,7 +61,7 @@
 use File::Copy;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK $errstr);
-$VERSION = substr(q$Revision: 2.31 $, 10);
+$VERSION = substr(q$Revision: 2.32 $, 10);
 
 sub writefile {
     my($file, $data, $opt) = @_;
@@ -71,7 +71,7 @@
 		$encoding = $opt->{encoding} ||= 'utf-8';
 		undef $encoding if $encoding eq 'raw';
 		$fallback = $opt->{fallback};
-		$fallback = Encode::PERLQQ unless defined $fallback;
+		$fallback = Encode::PERLQQ() unless defined $fallback;
 	}
 
 	$file = ">>$file" unless $file =~ /^[|>]/;
@@ -202,7 +202,7 @@
 	if ($::Variable->{MV_UTF8}) {
 		$encoding = $opt->{encoding} ||= 'utf-8';
 		$fallback = $opt->{fallback};
-		$fallback = Encode::PERLQQ unless defined $fallback;
+		$fallback = Encode::PERLQQ() unless defined $fallback;
 		undef $encoding if $encoding eq 'raw';
 	}
 	
@@ -236,7 +236,7 @@
 		binmode(READIN) if $Global::Windows;
 
         if ($encoding) {
-            local $PerlIO::encoding::fallback = Encode::PERLQQ;
+            local $PerlIO::encoding::fallback = Encode::PERLQQ();
             binmode(READIN, ":encoding($encoding)");
         }