diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-01 07:54:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-01 07:54:26 +0000 |
| commit | b5dde87123f7af25fc26d09245c3eb0a38433c03 (patch) | |
| tree | 534ddfcfa4397173f7e16d8d38887c74935cebdb | |
| parent | 7b1b979b47409d9bbb16a165e8d3a0d66f10dd92 (diff) | |
* lib/rdoc/ri/ri_paths.rb (RI::Paths): use RbConfig instead of
obsolete and deprecated Config.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rbconfig/obsolete.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/ri/ri_paths.rb | 4 | ||||
| -rw-r--r-- | test/dbm/test_dbm.rb | 4 | ||||
| -rw-r--r-- | test/gdbm/test_gdbm.rb | 4 |
5 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Fri Oct 1 16:54:19 2010 Nobuyoshi Nakada <[email protected]> + + * lib/rdoc/ri/ri_paths.rb (RI::Paths): use RbConfig instead of + obsolete and deprecated Config. + Fri Oct 1 15:12:05 2010 NAKAMURA Usaku <[email protected]> * win32/win32.c (init_stdhandle): redirect unopened IOs to NUL. diff --git a/lib/rbconfig/obsolete.rb b/lib/rbconfig/obsolete.rb index fcc7151ad2..25a993aa17 100644 --- a/lib/rbconfig/obsolete.rb +++ b/lib/rbconfig/obsolete.rb @@ -1,2 +1,2 @@ -warn "Use RbConfig instead of obsolete and deprecated Config." +warn "#{caller[0]}: Use RbConfig instead of obsolete and deprecated Config." Config = RbConfig # compatibility for ruby-1.8.4 and older. diff --git a/lib/rdoc/ri/ri_paths.rb b/lib/rdoc/ri/ri_paths.rb index 1af4739061..dd2a9a095d 100644 --- a/lib/rdoc/ri/ri_paths.rb +++ b/lib/rdoc/ri/ri_paths.rb @@ -26,9 +26,9 @@ module RI DOC_DIR = "doc/rdoc" - version = Config::CONFIG['ruby_version'] + version = RbConfig::CONFIG['ruby_version'] - base = File.join(Config::CONFIG['datadir'], "ri", version) + base = File.join(RbConfig::CONFIG['datadir'], "ri", version) SYSDIR = File.join(base, "system") SITEDIR = File.join(base, "site") homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH'] diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb index 0c8ec2d6fa..ca1913d55f 100644 --- a/test/dbm/test_dbm.rb +++ b/test/dbm/test_dbm.rb @@ -12,7 +12,7 @@ if defined? DBM class TestDBM < Test::Unit::TestCase def TestDBM.uname_s require 'rbconfig' - case Config::CONFIG['target_os'] + case RbConfig::CONFIG['target_os'] when 'cygwin' require 'Win32API' uname = Win32API.new('cygwin1', 'uname', 'P', 'I') @@ -21,7 +21,7 @@ if defined? DBM utsname.unpack('A20' * 5)[0] else - Config::CONFIG['target_os'] + RbConfig::CONFIG['target_os'] end end SYSTEM = uname_s diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb index 02574e203b..e0cf8bcb7d 100644 --- a/test/gdbm/test_gdbm.rb +++ b/test/gdbm/test_gdbm.rb @@ -12,7 +12,7 @@ if defined? GDBM class TestGDBM < Test::Unit::TestCase def TestGDBM.uname_s require 'rbconfig' - case Config::CONFIG['target_os'] + case RbConfig::CONFIG['target_os'] when 'cygwin' require 'Win32API' uname = Win32API.new('cygwin1', 'uname', 'P', 'I') @@ -21,7 +21,7 @@ if defined? GDBM utsname.unpack('A20' * 5)[0] else - Config::CONFIG['target_os'] + RbConfig::CONFIG['target_os'] end end SYSTEM = uname_s |