drop namespace::autoclean

diff --git a/Makefile.PL b/Makefile.PL
index 4a1b1c1..7953864 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -24,7 +24,6 @@ my %META = (
       requires => {
         'perl'                  => 5.008003,
         'List::Util'            => '1.45',
-        'namespace::autoclean'  => '0.28',
         'namespace::clean'      => '0.23',
         'MooseX::Emulate::Class::Accessor::Fast' => '0.00903',
         'Class::Load'           => '0.12',

diff --git a/lib/Catalyst/Component/ContextClosure.pm b/lib/Catalyst/Component/ContextClosure.pm
index b25cc46..8c163e0 100644 (file)
--- a/lib/Catalyst/Component/ContextClosure.pm
+++ b/lib/Catalyst/Component/ContextClosure.pm
@@ -2,7 +2,7 @@ package Catalyst::Component::ContextClosure;
 
 use Moose::Role;
 use Scalar::Util 'weaken';
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 sub make_context_closure {
     my ($self, $closure, $ctx) = @_;

diff --git a/lib/Catalyst/EngineLoader.pm b/lib/Catalyst/EngineLoader.pm
index e4d4c81..b93fb48 100644 (file)
--- a/lib/Catalyst/EngineLoader.pm
+++ b/lib/Catalyst/EngineLoader.pm
@@ -2,7 +2,7 @@ package Catalyst::EngineLoader;
 use Moose;
 use Catalyst::Exception;
 use Catalyst::Utils;
-use namespace::autoclean;
+use namespace::clean -except => ['meta'];
 
 extends 'Plack::Loader';
 

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index e7bc2d3..ae6049d 100644 (file)
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -3,11 +3,12 @@ package Catalyst::Response;
 use Moose;
 use HTTP::Headers;
 use Moose::Util::TypeConstraints;
-use namespace::autoclean;
 use Scalar::Util 'blessed';
 use Catalyst::Response::Writer;
 use Catalyst::Utils ();
 
+use namespace::clean -except => ['meta'];
+
 with 'MooseX::Emulate::Class::Accessor::Fast';
 
 our $DEFAULT_ENCODE_CONTENT_TYPE_MATCH = qr{text|xml$|javascript$};

diff --git a/lib/Catalyst/Script/CGI.pm b/lib/Catalyst/Script/CGI.pm
index e05fffb..4eb9be8 100644 (file)
--- a/lib/Catalyst/Script/CGI.pm
+++ b/lib/Catalyst/Script/CGI.pm
@@ -1,6 +1,6 @@
 package Catalyst::Script::CGI;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 sub _plack_engine_name { 'CGI' }
 

diff --git a/lib/Catalyst/Script/Create.pm b/lib/Catalyst/Script/Create.pm
index a74653b..1f819c7 100644 (file)
--- a/lib/Catalyst/Script/Create.pm
+++ b/lib/Catalyst/Script/Create.pm
@@ -1,7 +1,7 @@
 package Catalyst::Script::Create;
 use Moose;
 use Class::Load 'load_class';
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 with 'Catalyst::ScriptRole';
 

diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm
index 1eb7071..f4fd2e7 100644 (file)
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@ -1,7 +1,7 @@
 package Catalyst::Script::FastCGI;
 use Moose;
 use Data::OptList;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 sub _plack_engine_name { 'FCGI' }
 

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 983a995..6c859b9 100644 (file)
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -2,7 +2,7 @@ package Catalyst::Script::Server;
 use Moose;
 use Catalyst::Utils;
 use Class::Load qw(try_load_class load_class);
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 with 'Catalyst::ScriptRole';
 

diff --git a/lib/Catalyst/Script/Test.pm b/lib/Catalyst/Script/Test.pm
index 4209d62..0164cc6 100644 (file)
--- a/lib/Catalyst/Script/Test.pm
+++ b/lib/Catalyst/Script/Test.pm
@@ -1,7 +1,7 @@
 package Catalyst::Script::Test;
 use Moose;
 use Catalyst::Test ();
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 with 'Catalyst::ScriptRole';
 

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index 845e891..6ff8d28 100644 (file)
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -5,7 +5,7 @@ use MooseX::Getopt;
 use Catalyst::EngineLoader;
 use Moose::Util::TypeConstraints;
 use Catalyst::Utils;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 subtype 'Catalyst::ScriptRole::LoadableClass',
   as 'ClassName';

diff --git a/lib/Catalyst/ScriptRunner.pm b/lib/Catalyst/ScriptRunner.pm
index caf16dc..b9a60f8 100644 (file)
--- a/lib/Catalyst/ScriptRunner.pm
+++ b/lib/Catalyst/ScriptRunner.pm
@@ -5,8 +5,8 @@ use lib;
 use File::Spec;
 use Class::Load qw/ load_first_existing_class load_optional_class /;
 use Catalyst::Utils;
-use namespace::autoclean -also => 'subclass_with_traits';
 use Try::Tiny;
+use namespace::clean -except => [ 'meta' ];
 
 sub find_script_class {
     my ($self, $app, $script) = @_;
@@ -19,6 +19,7 @@ sub find_script_traits {
     return grep { load_optional_class($_) } @try;
 }
 
+no namespace::clean;
 sub subclass_with_traits {
     my ($base, @traits) = @_;
 
@@ -31,6 +32,7 @@ sub subclass_with_traits {
 
     return $meta->name;
 }
+use namespace::clean;
 
 sub run {
     my ($self, $appclass, $scriptclass) = @_;

diff --git a/t/aggregate/unit_core_script_fastcgi.t b/t/aggregate/unit_core_script_fastcgi.t
index 80a8068..1b24aea 100644 (file)
--- a/t/aggregate/unit_core_script_fastcgi.t
+++ b/t/aggregate/unit_core_script_fastcgi.t
@@ -14,7 +14,7 @@ local our $fake_handler = \42;
 {
     package TestFastCGIScript;
     use Moose;
-    use namespace::autoclean;
+    use namespace::clean -except => [ 'meta' ];
 
     extends 'Catalyst::Script::FastCGI';
 

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index c1e3733..95c046c 100644 (file)
--- a/t/arg_constraints.t
+++ b/t/arg_constraints.t
@@ -203,7 +203,7 @@ BEGIN {
 
   use Moose;
   use MooseX::MethodAttributes;
-  use namespace::autoclean -except => 'Int';
+  use namespace::clean -except => [ 'meta' ];
 
   use MyApp::Types qw/Int/;
 

diff --git a/t/lib/Catalyst/ActionRole/Guff.pm b/t/lib/Catalyst/ActionRole/Guff.pm
index 4f8e046..a05c646 100644 (file)
--- a/t/lib/Catalyst/ActionRole/Guff.pm
+++ b/t/lib/Catalyst/ActionRole/Guff.pm
@@ -1,8 +1,7 @@
 package Catalyst::ActionRole::Guff;
 
 use Moose::Role;
-
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 after execute => sub {
     my ($self, $controller, $c) = @_;

diff --git a/t/lib/Catalyst/ActionRole/Zoo.pm b/t/lib/Catalyst/ActionRole/Zoo.pm
index d4f0c9f..79ab0d6 100644 (file)
--- a/t/lib/Catalyst/ActionRole/Zoo.pm
+++ b/t/lib/Catalyst/ActionRole/Zoo.pm
@@ -1,8 +1,7 @@
 package Catalyst::ActionRole::Zoo;
 
 use Moose::Role;
-
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 after execute => sub {
     my ($self, $controller, $c) = @_;

diff --git a/t/lib/Catalyst/Script/Bar.pm b/t/lib/Catalyst/Script/Bar.pm
index 18e699c..8b251a2 100644 (file)
--- a/t/lib/Catalyst/Script/Bar.pm
+++ b/t/lib/Catalyst/Script/Bar.pm
@@ -1,6 +1,6 @@
 package Catalyst::Script::Bar;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 with 'Catalyst::ScriptRole';
 

diff --git a/t/lib/Catalyst/Script/Baz.pm b/t/lib/Catalyst/Script/Baz.pm
index d699fe6..a506056 100644 (file)
--- a/t/lib/Catalyst/Script/Baz.pm
+++ b/t/lib/Catalyst/Script/Baz.pm
@@ -1,6 +1,6 @@
 package Catalyst::Script::Baz;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 use Test::More;
 

diff --git a/t/lib/Catalyst/Script/CompileTest.pm b/t/lib/Catalyst/Script/CompileTest.pm
index df81247..5167d30 100644 (file)
--- a/t/lib/Catalyst/Script/CompileTest.pm
+++ b/t/lib/Catalyst/Script/CompileTest.pm
@@ -1,6 +1,6 @@
 package Catalyst::Script::CompileTest;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 use Test::More;
 

diff --git a/t/lib/ChainedActionsApp.pm b/t/lib/ChainedActionsApp.pm
index 3be4faf..98f5209 100644 (file)
--- a/t/lib/ChainedActionsApp.pm
+++ b/t/lib/ChainedActionsApp.pm
@@ -1,12 +1,13 @@
 package ChainedActionsApp;
 use Moose;
-use namespace::autoclean;
 use TestLogger;
 
 use Catalyst::Runtime 5.80;
 
 use Catalyst qw//;
 
+use namespace::clean -except => [ 'meta' ];
+
 extends 'Catalyst';
 
 our $VERSION = "0.01";

diff --git a/t/lib/ChainedActionsApp/Controller/Root.pm b/t/lib/ChainedActionsApp/Controller/Root.pm
index 07d0d2e..e061123 100644 (file)
--- a/t/lib/ChainedActionsApp/Controller/Root.pm
+++ b/t/lib/ChainedActionsApp/Controller/Root.pm
@@ -1,6 +1,6 @@
 package ChainedActionsApp::Controller::Root;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller' }
 

diff --git a/t/lib/Guff.pm b/t/lib/Guff.pm
index 16e558e..d929b22 100644 (file)
--- a/t/lib/Guff.pm
+++ b/t/lib/Guff.pm
@@ -1,8 +1,7 @@
 package Guff;
 
 use Moose::Role;
-
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 after execute => sub {
     my ($self, $controller, $c) = @_;

diff --git a/t/lib/ScriptTestApp/Controller/Root.pm b/t/lib/ScriptTestApp/Controller/Root.pm
index f88ce33..a6a04cc 100644 (file)
--- a/t/lib/ScriptTestApp/Controller/Root.pm
+++ b/t/lib/ScriptTestApp/Controller/Root.pm
@@ -1,6 +1,6 @@
 package ScriptTestApp::Controller::Root;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller' }
 

diff --git a/t/lib/ScriptTestApp/Script/Bar.pm b/t/lib/ScriptTestApp/Script/Bar.pm
index 9617441..eb37ac7 100644 (file)
--- a/t/lib/ScriptTestApp/Script/Bar.pm
+++ b/t/lib/ScriptTestApp/Script/Bar.pm
@@ -1,6 +1,6 @@
 package ScriptTestApp::Script::Bar;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 with 'Catalyst::ScriptRole';
 

diff --git a/t/lib/ScriptTestApp/Script/CompileTest.pm b/t/lib/ScriptTestApp/Script/CompileTest.pm
index 5d4b89c..ffdb676 100644 (file)
--- a/t/lib/ScriptTestApp/Script/CompileTest.pm
+++ b/t/lib/ScriptTestApp/Script/CompileTest.pm
@@ -1,6 +1,6 @@
 package ScriptTestApp::Script::CompileTest;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 die("Does not compile");
 

diff --git a/t/lib/ScriptTestApp/Script/Foo.pm b/t/lib/ScriptTestApp/Script/Foo.pm
index 8d61c63..2656be8 100644 (file)
--- a/t/lib/ScriptTestApp/Script/Foo.pm
+++ b/t/lib/ScriptTestApp/Script/Foo.pm
@@ -1,6 +1,6 @@
 package ScriptTestApp::Script::Foo;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 with 'Catalyst::ScriptRole';
 

diff --git a/t/lib/ScriptTestApp/TraitFor/Script.pm b/t/lib/ScriptTestApp/TraitFor/Script.pm
index 43a50cc..7bea94a 100644 (file)
--- a/t/lib/ScriptTestApp/TraitFor/Script.pm
+++ b/t/lib/ScriptTestApp/TraitFor/Script.pm
@@ -1,6 +1,6 @@
 package ScriptTestApp::TraitFor::Script;
 use Moose::Role;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 around run => sub {
     my ($orig, $self, @args) = @_;

diff --git a/t/lib/ScriptTestApp/TraitFor/Script/Bar.pm b/t/lib/ScriptTestApp/TraitFor/Script/Bar.pm
index 5d5ecc7..dc20763 100644 (file)
--- a/t/lib/ScriptTestApp/TraitFor/Script/Bar.pm
+++ b/t/lib/ScriptTestApp/TraitFor/Script/Bar.pm
@@ -1,6 +1,6 @@
 package ScriptTestApp::TraitFor::Script::Bar;
 use Moose::Role;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 around run => sub {
     my ($orig, $self, @args) = @_;

diff --git a/t/lib/ScriptTestApp/TraitFor/Script/Foo.pm b/t/lib/ScriptTestApp/TraitFor/Script/Foo.pm
index 0536a73..a33324a 100644 (file)
--- a/t/lib/ScriptTestApp/TraitFor/Script/Foo.pm
+++ b/t/lib/ScriptTestApp/TraitFor/Script/Foo.pm
@@ -1,6 +1,6 @@
 package ScriptTestApp::TraitFor::Script::Foo;
 use Moose::Role;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 around run => sub {
     my ($orig, $self, @args) = @_;

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index 12f00a3..c2545db 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -14,7 +14,7 @@ use Catalyst::Utils;
 use Class::Load 'try_load_class';
 
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 # -----------
 # t/aggregate/unit_core_ctx_attr.t pukes until lazy is true

diff --git a/t/lib/TestApp/Action/TestActionArgsFromConstructor.pm b/t/lib/TestApp/Action/TestActionArgsFromConstructor.pm
index 67f8a13..acdc031 100644 (file)
--- a/t/lib/TestApp/Action/TestActionArgsFromConstructor.pm
+++ b/t/lib/TestApp/Action/TestActionArgsFromConstructor.pm
@@ -1,7 +1,7 @@
 package TestApp::Action::TestActionArgsFromConstructor;
 
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 extends 'Catalyst::Action';
 

diff --git a/t/lib/TestApp/Action/TestExtraArgsAction.pm b/t/lib/TestApp/Action/TestExtraArgsAction.pm
index 3cfb38b..be208d5 100644 (file)
--- a/t/lib/TestApp/Action/TestExtraArgsAction.pm
+++ b/t/lib/TestApp/Action/TestExtraArgsAction.pm
@@ -1,7 +1,7 @@
 package TestApp::Action::TestExtraArgsAction;
 
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 extends 'Catalyst::Action';
 

diff --git a/t/lib/TestApp/ActionRole/Kooh.pm b/t/lib/TestApp/ActionRole/Kooh.pm
index fc82bf2..825abc8 100644 (file)
--- a/t/lib/TestApp/ActionRole/Kooh.pm
+++ b/t/lib/TestApp/ActionRole/Kooh.pm
@@ -1,8 +1,7 @@
 package TestApp::ActionRole::Kooh;
 
 use Moose::Role;
-
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 after execute => sub {
     my ($self, $controller, $c) = @_;

diff --git a/t/lib/TestApp/Plugin/ParameterizedRole.pm b/t/lib/TestApp/Plugin/ParameterizedRole.pm
index f02d454..71ece2f 100644 (file)
--- a/t/lib/TestApp/Plugin/ParameterizedRole.pm
+++ b/t/lib/TestApp/Plugin/ParameterizedRole.pm
@@ -1,7 +1,7 @@
 package TestApp::Plugin::ParameterizedRole;
 
 use MooseX::Role::Parameterized;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 parameter method_name => (
     isa      => 'Str',

diff --git a/t/lib/TestAppEncodingSetInApp/Controller/Root.pm b/t/lib/TestAppEncodingSetInApp/Controller/Root.pm
index 608f2af..dd17b95 100644 (file)
--- a/t/lib/TestAppEncodingSetInApp/Controller/Root.pm
+++ b/t/lib/TestAppEncodingSetInApp/Controller/Root.pm
@@ -1,6 +1,6 @@
 package TestAppEncodingSetInApp::Controller::Root;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller'; }
 

diff --git a/t/lib/TestAppEncodingSetInConfig/Controller/Root.pm b/t/lib/TestAppEncodingSetInConfig/Controller/Root.pm
index 6362e93..68ae2f3 100644 (file)
--- a/t/lib/TestAppEncodingSetInConfig/Controller/Root.pm
+++ b/t/lib/TestAppEncodingSetInConfig/Controller/Root.pm
@@ -1,6 +1,6 @@
 package TestAppEncodingSetInConfig::Controller::Root;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller'; }
 

diff --git a/t/lib/TestAppShowInternalActions.pm b/t/lib/TestAppShowInternalActions.pm
index 250730f..0053388 100644 (file)
--- a/t/lib/TestAppShowInternalActions.pm
+++ b/t/lib/TestAppShowInternalActions.pm
@@ -1,6 +1,6 @@
 package TestAppShowInternalActions;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 use Catalyst::Runtime 5.80;
 

diff --git a/t/lib/TestAppShowInternalActions/Controller/Root.pm b/t/lib/TestAppShowInternalActions/Controller/Root.pm
index c36df9c..b269e98 100644 (file)
--- a/t/lib/TestAppShowInternalActions/Controller/Root.pm
+++ b/t/lib/TestAppShowInternalActions/Controller/Root.pm
@@ -1,6 +1,6 @@
 package TestAppShowInternalActions::Controller::Root;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller' }
 

diff --git a/t/lib/TestPath/Controller/Four.pm b/t/lib/TestPath/Controller/Four.pm
index b7426b5..c35d8eb 100644 (file)
--- a/t/lib/TestPath/Controller/Four.pm
+++ b/t/lib/TestPath/Controller/Four.pm
@@ -1,6 +1,6 @@
 package TestPath::Controller::Four;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller' }
 
@@ -9,4 +9,4 @@ sub four :Path('') :Args() {
     $c->response->body( 'OK' );
 }
 
-__PACKAGE__->meta->make_immutable;
\ No newline at end of file
+__PACKAGE__->meta->make_immutable;

diff --git a/t/lib/TestPath/Controller/One.pm b/t/lib/TestPath/Controller/One.pm
index 5c23b23..a0978ff 100644 (file)
--- a/t/lib/TestPath/Controller/One.pm
+++ b/t/lib/TestPath/Controller/One.pm
@@ -1,6 +1,6 @@
 package TestPath::Controller::One;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller' }
 
@@ -9,4 +9,4 @@ sub one :Path {
     $c->response->body( 'OK' );
 }
 
-__PACKAGE__->meta->make_immutable;
\ No newline at end of file
+__PACKAGE__->meta->make_immutable;

diff --git a/t/lib/TestPath/Controller/Three.pm b/t/lib/TestPath/Controller/Three.pm
index 09f5a5d..6707ae2 100644 (file)
--- a/t/lib/TestPath/Controller/Three.pm
+++ b/t/lib/TestPath/Controller/Three.pm
@@ -1,6 +1,6 @@
 package TestPath::Controller::Three;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller' }
 
@@ -9,4 +9,4 @@ sub three :Path('') {
     $c->response->body( 'OK' );
 }
 
-__PACKAGE__->meta->make_immutable;
\ No newline at end of file
+__PACKAGE__->meta->make_immutable;

diff --git a/t/lib/TestPath/Controller/Two.pm b/t/lib/TestPath/Controller/Two.pm
index b5373df..fdb801a 100644 (file)
--- a/t/lib/TestPath/Controller/Two.pm
+++ b/t/lib/TestPath/Controller/Two.pm
@@ -1,6 +1,6 @@
 package TestPath::Controller::Two;
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 BEGIN { extends 'Catalyst::Controller' }
 
@@ -9,4 +9,4 @@ sub two :Path() {
     $c->response->body( 'OK' );
 }
 
-__PACKAGE__->meta->make_immutable;
\ No newline at end of file
+__PACKAGE__->meta->make_immutable;