summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-12 14:03:03 +0000
committerxibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-12 14:03:03 +0000
commitbed9e8e297f2ba77b8a8ce45748804697fd9bfe1 (patch)
tree1d034954de6a4b20d635948a9d83a9cd3e39ed4d
parent9e0f3e0db9579d4271981f0804ebfac7c4e4486b (diff)
* lib/net/telnet.rb: don't use simple delegate.
because SimpleDelegate behavior changed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/telnet.rb4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e174a0135c..5de892c1bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 12 22:55:42 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
+
+ * lib/net/telnet.rb: don't use simple delegate.
+ because SimpleDelegate behavior changed.
+
Thu Nov 12 14:33:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread_win32.c (thread_errno): CreateThread does not set errno.
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 17eec1f5e2..f233827a59 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -10,7 +10,6 @@
#
require "socket"
-require "delegate"
require "timeout"
require "English"
@@ -93,7 +92,7 @@ module Net
# of relevant RFCs, see
# http://www.omnifarious.org/~hopper/technical/telnet-rfc.html
#
- class Telnet < SimpleDelegator
+ class Telnet
# :stopdoc:
IAC = 255.chr # "\377" # "\xff" # interpret as command
@@ -368,7 +367,6 @@ module Net
@dumplog.log_dump('#', message) if @options.has_key?("Dump_log")
end
- super(@sock)
end # initialize
# The socket the Telnet object is using. Note that this object becomes