3 files changed, 1 insertions, 57 deletions
diff --git a/actionpack/lib/action_view/template/handler.rb b/actionpack/lib/action_view/template/handler.rb
deleted file mode 100644
index 636f3ebbad..0000000000
--- a/actionpack/lib/action_view/template/handler.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'action_dispatch/http/mime_type'
-require 'active_support/core_ext/class/attribute'
-
-# Legacy TemplateHandler stub
-module ActionView
-  class Template
-    module Handlers #:nodoc:
-      module Compilable
-        def self.included(base)
-          ActiveSupport::Deprecation.warn "Including Compilable in your template handler is deprecated. " <<
-            "Since Rails 3, all the API your template handler needs to implement is to respond to #call."
-          base.extend(ClassMethods)
-        end
-
-        module ClassMethods
-          def call(template)
-            new.compile(template)
-          end
-        end
-
-        def compile(template)
-          raise "Need to implement #{self.class.name}#compile(template)"
-        end
-      end
-    end
-
-    class Template::Handler
-      class_attribute :default_format
-      self.default_format = Mime::HTML
-
-      def self.inherited(base)
-        ActiveSupport::Deprecation.warn "Inheriting from ActionView::Template::Handler is deprecated. " <<
-          "Since Rails 3, all the API your template handler needs to implement is to respond to #call."
-        super
-      end
-
-      def self.call(template)
-        raise "Need to implement #{self.class.name}#call(template)"
-      end
-
-      def render(template, local_assigns)
-        raise "Need to implement #{self.class.name}#render(template, local_assigns)"
-      end
-    end
-  end
-
-  TemplateHandlers = Template::Handlers
-  TemplateHandler = Template::Handler
-end
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb
index 959afa734e..aa693335e3 100644
--- a/actionpack/lib/action_view/template/handlers.rb
+++ b/actionpack/lib/action_view/template/handlers.rb
@@ -41,12 +41,6 @@ module ActionView #:nodoc:
         @@default_template_handlers = klass
       end
 
-      def handler_class_for_extension(extension)
-        ActiveSupport::Deprecation.warn "handler_class_for_extension is deprecated. " <<
-          "Please use handler_for_extension instead", caller
-        handler_for_extension(extension)
-      end
-
       def handler_for_extension(extension)
         registered_template_handler(extension) || @@default_template_handlers
       end
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 7e9e4e518a..77720e2bc8 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,6 +1,5 @@
+require 'action_dispatch/http/mime_type'
 require 'active_support/core_ext/class/attribute_accessors'
-require 'action_view/template'
-require 'action_view/template/handler'
 require 'erubis'
 
 module ActionView