[Everydevel-opers] SF.net SVN: everydevel: [923] trunk/ebase

[<pau...@us...>]

Revision: 923
          http://svn.sourceforge.net/everydevel/?rev=923&view=rev
Author:   paul_the_nomad
Date:     2006-12-08 05:03:10 -0800 (Fri, 08 Dec 2006)

Log Message:
-----------
Export to request (task 133810).  Util.pm export on request only.  Also minor
changes in modules using Util.pm.

Modified Paths:
--------------
    trunk/ebase/lib/Everything/Node/setting.pm
    trunk/ebase/lib/Everything/Node.pm
    trunk/ebase/lib/Everything/Test/Util.pm
    trunk/ebase/lib/Everything/Util.pm
    trunk/ebase/t/HTML.t

Modified: trunk/ebase/lib/Everything/Node/setting.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/setting.pm	2006-12-08 11:50:28 UTC (rev 922)
+++ trunk/ebase/lib/Everything/Node/setting.pm	2006-12-08 13:03:10 UTC (rev 923)
@@ -14,7 +14,6 @@
 use base 'Everything::Node::node';
 
 use Everything::Security;
-use Everything::Util;
 use Everything::XML;
 use XML::DOM;
 use Scalar::Util 'reftype';

Modified: trunk/ebase/lib/Everything/Node.pm
===================================================================
--- trunk/ebase/lib/Everything/Node.pm	2006-12-08 11:50:28 UTC (rev 922)
+++ trunk/ebase/lib/Everything/Node.pm	2006-12-08 13:03:10 UTC (rev 923)
@@ -20,7 +20,7 @@
 
 use strict;
 use Everything ();
-use Everything::Util;
+use Everything::Util ();
 use XML::DOM;
 use SUPER;
 

Modified: trunk/ebase/lib/Everything/Test/Util.pm
===================================================================
--- trunk/ebase/lib/Everything/Test/Util.pm	2006-12-08 11:50:28 UTC (rev 922)
+++ trunk/ebase/lib/Everything/Test/Util.pm	2006-12-08 13:03:10 UTC (rev 923)
@@ -14,7 +14,7 @@
     $file .= '.pm';
 
     require $file;
-    $class->import;
+    $class->import(qw/escape unescape/); # expressly import these subs
 
 }
 

Modified: trunk/ebase/lib/Everything/Util.pm
===================================================================
--- trunk/ebase/lib/Everything/Util.pm	2006-12-08 11:50:28 UTC (rev 922)
+++ trunk/ebase/lib/Everything/Util.pm	2006-12-08 13:03:10 UTC (rev 923)
@@ -13,18 +13,10 @@
 
 use strict;
 
-sub BEGIN
-{
-	use Exporter ();
-	use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-	@ISA    = qw(Exporter);
-	@EXPORT = qw(
-		escape
-		unescape
-	);
-}
-
 use URI::Escape ();
+use base 'Exporter';
+our (@EXPORT_OK);
+@EXPORT_OK = qw/escape unescape/;
 
 =cut
 

Modified: trunk/ebase/t/HTML.t
===================================================================
--- trunk/ebase/t/HTML.t	2006-12-08 11:50:28 UTC (rev 922)
+++ trunk/ebase/t/HTML.t	2006-12-08 13:03:10 UTC (rev 923)
@@ -6,7 +6,7 @@
 BEGIN
 {
 	chdir 't' if -d 't';
-	use lib 'lib';
+	use lib 'lib', '../lib';
 }
 
 use strict;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.