From 50f6e01b4444aa1a1004278ff3d7b0c1d4978fa2 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 4 Feb 2008 00:02:53 +0000 Subject: [PATCH] * lib/cgi.rb (CGI::QueryExtension::[]): no more transition extend(CGI::Value). a patch from in [ruby-dev:33583]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/cgi.rb | 25 ------------------------- version.h | 6 +++--- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index dba515d8ae..6a936c17bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 4 08:59:31 2008 Yukihiro Matsumoto + + * lib/cgi.rb (CGI::QueryExtension::[]): no more transition + extend(CGI::Value). a patch from in + [ruby-dev:33583]. + Sun Feb 03 21:13:13 2008 Yusuke Endoh * test/ruby/test_numeric.rb: forgot to add this (at r15360). diff --git a/lib/cgi.rb b/lib/cgi.rb index 963b6b1fc3..52502b3114 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -1178,29 +1178,6 @@ class CGI @multipart end - module Value # :nodoc: - def set_params(params) - @params = params - end - def [](idx, *args) - if args.size == 0 - warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']" - @params[idx] - else - super[idx,*args] - end - end - def first - warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']" - self - end - alias last first - def to_a - @params || [self] - end - alias to_ary to_a # to be rhs of multiple assignment - end - # Get the value for the parameter with a given key. # # If the parameter has multiple values, only the first will be @@ -1219,8 +1196,6 @@ class CGI end else str = if value then value.dup else "" end - str.extend(Value) - str.set_params(params) str end end diff --git a/version.h b/version.h index 1ce3a78580..c462cc60ed 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-02-02" +#define RUBY_RELEASE_DATE "2008-02-04" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080202 +#define RUBY_RELEASE_CODE 20080204 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 4 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];