931b57
From 2c6f580d94d78b0a8e120ba86858ffcb003b08eb Mon Sep 17 00:00:00 2001
931b57
From: Jitka Plesnikova <jplesnik@redhat.com>
931b57
Date: Thu, 24 May 2018 09:38:04 +0200
931b57
Subject: [PATCH] Upgrade to 5.73
931b57
931b57
---
931b57
 lib/Exporter.pm | 32 ++++++++++++++++----------------
931b57
 1 file changed, 16 insertions(+), 16 deletions(-)
931b57
931b57
diff --git a/lib/Exporter.pm b/lib/Exporter.pm
931b57
index 0b3db21..0e8775d 100644
931b57
--- a/lib/Exporter.pm
931b57
+++ b/lib/Exporter.pm
931b57
@@ -9,7 +9,7 @@ require 5.006;
931b57
 our $Debug = 0;
931b57
 our $ExportLevel = 0;
931b57
 our $Verbose ||= 0;
931b57
-our $VERSION = '5.72';
931b57
+our $VERSION = '5.73';
931b57
 our (%Cache);
931b57
 
931b57
 sub as_heavy {
931b57
@@ -106,14 +106,14 @@ In module F<YourModule.pm>:
931b57
 
931b57
   package YourModule;
931b57
   require Exporter;
931b57
-  @ISA = qw(Exporter);
931b57
-  @EXPORT_OK = qw(munge frobnicate);  # symbols to export on request
931b57
+  our @ISA = qw(Exporter);
931b57
+  our @EXPORT_OK = qw(munge frobnicate);  # symbols to export on request
931b57
 
931b57
 or
931b57
 
931b57
   package YourModule;
931b57
   use Exporter 'import'; # gives you Exporter's import() method directly
931b57
-  @EXPORT_OK = qw(munge frobnicate);  # symbols to export on request
931b57
+  our @EXPORT_OK = qw(munge frobnicate);  # symbols to export on request
931b57
 
931b57
 In other files which wish to use C<YourModule>:
931b57
 
931b57
@@ -146,8 +146,8 @@ symbols can represent functions, scalars, arrays, hashes, or typeglobs.
931b57
 The symbols must be given by full name with the exception that the
931b57
 ampersand in front of a function is optional, e.g.
931b57
 
931b57
-    @EXPORT    = qw(afunc $scalar @array);   # afunc is a function
931b57
-    @EXPORT_OK = qw(&bfunc %hash *typeglob); # explicit prefix on &bfunc
931b57
+    our @EXPORT    = qw(afunc $scalar @array);   # afunc is a function
931b57
+    our @EXPORT_OK = qw(&bfunc %hash *typeglob); # explicit prefix on &bfunc
931b57
 
931b57
 If you are only exporting function names it is recommended to omit the
931b57
 ampersand, as the implementation is faster this way.
931b57
@@ -234,9 +234,9 @@ include :DEFAULT explicitly.
931b57
 
931b57
 e.g., F<Module.pm> defines:
931b57
 
931b57
-    @EXPORT      = qw(A1 A2 A3 A4 A5);
931b57
-    @EXPORT_OK   = qw(B1 B2 B3 B4 B5);
931b57
-    %EXPORT_TAGS = (T1 => [qw(A1 A2 B1 B2)], T2 => [qw(A1 A2 B3 B4)]);
931b57
+    our @EXPORT      = qw(A1 A2 A3 A4 A5);
931b57
+    our @EXPORT_OK   = qw(B1 B2 B3 B4 B5);
931b57
+    our %EXPORT_TAGS = (T1 => [qw(A1 A2 B1 B2)], T2 => [qw(A1 A2 B3 B4)]);
931b57
 
931b57
 Note that you cannot use tags in @EXPORT or @EXPORT_OK.
931b57
 
931b57
@@ -279,8 +279,8 @@ import function:
931b57
 
931b57
     package A;
931b57
 
931b57
-    @ISA = qw(Exporter);
931b57
-    @EXPORT_OK = qw($b);
931b57
+    our @ISA = qw(Exporter);
931b57
+    our @EXPORT_OK = qw($b);
931b57
 
931b57
     sub import
931b57
     {
931b57
@@ -293,8 +293,8 @@ inheritance, as it stands Exporter::import() will never get called.
931b57
 Instead, say the following:
931b57
 
931b57
     package A;
931b57
-    @ISA = qw(Exporter);
931b57
-    @EXPORT_OK = qw($b);
931b57
+    our @ISA = qw(Exporter);
931b57
+    our @EXPORT_OK = qw($b);
931b57
 
931b57
     sub import
931b57
     {
931b57
@@ -374,7 +374,7 @@ Since the symbols listed within C<%EXPORT_TAGS> must also appear in either
931b57
 C<@EXPORT> or C<@EXPORT_OK>, two utility functions are provided which allow
931b57
 you to easily add tagged sets of symbols to C<@EXPORT> or C<@EXPORT_OK>:
931b57
 
931b57
-  %EXPORT_TAGS = (foo => [qw(aa bb cc)], bar => [qw(aa cc dd)]);
931b57
+  our %EXPORT_TAGS = (foo => [qw(aa bb cc)], bar => [qw(aa cc dd)]);
931b57
 
931b57
   Exporter::export_tags('foo');     # add aa, bb and cc to @EXPORT
931b57
   Exporter::export_ok_tags('bar');  # add aa, cc and dd to @EXPORT_OK
931b57
@@ -391,7 +391,7 @@ useful to create the utility ":all" to simplify "use" statements.
931b57
 
931b57
 The simplest way to do this is:
931b57
 
931b57
-  %EXPORT_TAGS = (foo => [qw(aa bb cc)], bar => [qw(aa cc dd)]);
931b57
+ our  %EXPORT_TAGS = (foo => [qw(aa bb cc)], bar => [qw(aa cc dd)]);
931b57
 
931b57
   # add all the other ":class" tags to the ":all" class,
931b57
   # deleting duplicates
931b57
@@ -460,7 +460,7 @@ variables C<@EXPORT_OK>, C<@EXPORT>, C<@ISA>, etc.
931b57
   our @ISA = qw(Exporter);
931b57
   our @EXPORT_OK = qw(munge frobnicate);
931b57
 
931b57
-If backward compatibility for Perls under 5.6 is important,
931b57
+If backward compatibility for Perls B<under> 5.6 is important,
931b57
 one must write instead a C<use vars> statement.
931b57
 
931b57
   use vars qw(@ISA @EXPORT_OK);
931b57
-- 
931b57
2.14.3
931b57