* error.c (Init_Exception): make NameError to be subclass of

  StandardError again.

* error.c (Init_Exception): make SecurityError to be subclass of
  Exception, since it's too important to be handled implicitly.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 20 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 75523d5eab..4c7db669ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov  1 21:56:45 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (Init_Exception): make NameError to be subclass of
+	  StandardError again.
+
+	* error.c (Init_Exception): make SecurityError to be subclass of
+	  Exception, since it's too important to be handled implicitly.
+
 Thu Nov  1 14:51:39 UTC 2007 David Flanagan <davidflanagan@ruby-lang.org>
 	* enum.c (take_while_i, drop_while_i) add RTEST to handle nil return
 	
diff --git a/error.c b/error.c
index c72873d9b3..b8a98acfae 100644
--- a/error.c
+++ b/error.c
@@ -1038,7 +1038,7 @@ Init_Exception(void)
     rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
     rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
 
-    rb_eNameError     = rb_define_class("NameError", rb_eScriptError);
+    rb_eNameError     = rb_define_class("NameError", rb_eStandardError);
     rb_define_method(rb_eNameError, "initialize", name_err_initialize, -1);
     rb_define_method(rb_eNameError, "name", name_err_name, 0);
     rb_define_method(rb_eNameError, "to_s", name_err_to_s, 0);
@@ -1053,7 +1053,7 @@ Init_Exception(void)
     rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
 
     rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
-    rb_eSecurityError = rb_define_class("SecurityError", rb_eStandardError);
+    rb_eSecurityError = rb_define_class("SecurityError", rb_eException);
     rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
 
     syserr_tbl = st_init_numtable();
diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb
index 7cba934feb..5da75cee37 100644
--- a/lib/rss/atom.rb
+++ b/lib/rss/atom.rb
@@ -58,7 +58,7 @@ module RSS
       end
 
       def setup_maker_element(target)
-        target.__send__(setup_maker_element_writer, content)
+        target.__send(setup_maker_element_writer, content)
         super
       end
     end
@@ -131,7 +131,7 @@ module RSS
 
       private
       def maker_target(target)
-        target.__send__(self.class.name.split(/::/).last.downcase) {|x| x}
+        target.__send(self.class.name.split(/::/).last.downcase) {|x| x}
       end
 
       def setup_maker_attributes(target)
@@ -156,7 +156,7 @@ module RSS
       end
 
       def maker_target(target)
-        target.__send__("new_#{self.class.name.split(/::/).last.downcase}")
+        target.__send("new_#{self.class.name.split(/::/).last.downcase}")
       end
 
       class Name < RSS::Element
@@ -227,7 +227,7 @@ module RSS
        ["entry", "*", :children, "entries"],
       ].each do |tag, occurs, type, *args|
         type ||= :child
-        __send__("install_have_#{type}_element",
+        __send("install_have_#{type}_element",
                  tag, URI, occurs, tag, *args)
       end
 
@@ -405,7 +405,7 @@ module RSS
          ["updated", nil, :child, :content],
         ].each do |tag, occurs, type, *args|
           type ||= :attribute
-          __send__("install_have_#{type}_element",
+          __send("install_have_#{type}_element",
                    tag, URI, occurs, tag, *args)
         end
 
@@ -603,7 +603,7 @@ module RSS
            ["updated", "?", nil, :content],
           ].each do |tag, occurs, type, *args|
             type ||= :attribute
-            __send__("install_have_#{type}_element",
+            __send("install_have_#{type}_element",
                      tag, URI, occurs, tag, *args)
           end
 
@@ -655,7 +655,7 @@ module RSS
        ["updated", nil, nil, :content],
       ].each do |tag, occurs, type, *args|
         type ||= :attribute
-        __send__("install_have_#{type}_element",
+        __send("install_have_#{type}_element",
                  tag, URI, occurs, tag, *args)
       end
 
diff --git a/version.h b/version.h
index c1500e48e3..25882fb14c 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-01"
+#define RUBY_RELEASE_DATE "2007-11-02"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071101
+#define RUBY_RELEASE_CODE 20071102
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];