exception model changed

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

4 files changed, 5 insertions, 5 deletions

diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index d10657bbad..d9acf5603a 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -72,11 +72,11 @@ else
 	# def_exception(c, m)
 	#	    n:  exception_name
 	#	    m:  message_form
-	#	    s:	例外スーパークラス(デフォルト: Exception)
+	#	    s:	例外スーパークラス(デフォルト: StandardError)
 	#	例外名``c''をもつ例外を定義し, そのメッセージをmとする.
 	#
 	#def def_exception(n, m)
-	def self.def_exception(n, m, s = Exception)
+	def self.def_exception(n, m, s = StandardError)
 	  n = n.id2name if n.kind_of?(Fixnum)
 	  e = Class.new(s)
 	  const_set(n, e)
diff --git a/lib/ftplib.rb b/lib/ftplib.rb
index e79868b0ef..f0c3f10930 100644
--- a/lib/ftplib.rb
+++ b/lib/ftplib.rb
@@ -8,7 +8,7 @@
 require "socket"
 require "monitor"
 
-class FTPError < Exception; end
+class FTPError < StandardError; end
 class FTPReplyError < FTPError; end
 class FTPTempError < FTPError; end
 class FTPPermError < FTPError; end
diff --git a/lib/sync.rb b/lib/sync.rb
index 6d79cc26bf..9f9706d9ee 100644
--- a/lib/sync.rb
+++ b/lib/sync.rb
@@ -55,7 +55,7 @@ module Sync_m
   EX = :EX
   
   # 例外定義
-  class Err < Exception
+  class Err < StandardError
     def Err.Fail(*opt)
       fail self, sprintf(self::Message, *opt)
     end
diff --git a/lib/thread.rb b/lib/thread.rb
index 709aa83c25..7706d59cbb 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -9,7 +9,7 @@ unless defined? Thread
 end
 
 unless defined? ThreadError
-  class ThreadError<Exception
+  class ThreadError<StandardError
   end
 end