From 2546a366ed0c20fb6ac644dfedd222ec471c0e46 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 27 May 2004 12:41:10 +0000 Subject: [PATCH] * lib/pathname.rb (Pathname#initialize): fix pathname initialization by pathname. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/pathname.rb | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e6a7c8988..68e9a51019 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 27 21:37:50 2004 Tanaka Akira + + * lib/pathname.rb (Pathname#initialize): refine pathname initialization + by pathname. + Thu May 27 20:22:05 Hirokazu Yamamoto * io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648] diff --git a/lib/pathname.rb b/lib/pathname.rb index ac420a5cae..663afcf5ed 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -185,7 +185,8 @@ class Pathname # If +path+ contains a NUL character (\0), an ArgumentError is raised. # def initialize(path) - @path = path.to_str.dup + path = path.to_str if path.respond_to? :to_str + @path = path.dup if /\0/ =~ @path raise ArgumentError, "pathname contains \\0: #{@path.inspect}" @@ -882,6 +883,13 @@ if $0 == __FILE__ require 'test/unit' class PathnameTest < Test::Unit::TestCase # :nodoc: + def test_initialize + p1 = Pathname.new('a') + assert_equal('a', p1.to_s) + p2 = Pathname.new(p1) + assert_equal(p1, p2) + end + class AnotherStringLike # :nodoc: def initialize(s) @s = s end def to_str() @s end