From b1cfb98e9e5c3f81fba0d81e7e7a493c565f2462 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 26 Sep 2015 23:16:37 +0000
Subject: [PATCH] ostruct.rb: fix NameError

* lib/ostruct.rb (delete_field): do not raise NameError for
  existing keys.  [Fix GH-1033]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 10 ++++++++++
 lib/ostruct.rb |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5b97353f8..91f0672943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Sep 27 08:16:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (delete_field): do not raise NameError for
+	  existing keys.  [Fix GH-1033]
+
+Sun Sep 27 08:16:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (delete_field): do not raise NameError for
+	  existing keys.  [Fix GH-1033]
+
 Sun Sep 27 00:34:31 2015  Zachary Scott  <zzak@ruby-lang.org>
 
         * lib/ostruct.rb: Move method definitions for getter/setter to be lazy
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index eeea22042c..a48ae9af05 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -220,8 +220,13 @@ class OpenStruct
   #
   def delete_field(name)
     sym = name.to_sym
-    singleton_class.__send__(:remove_method, sym, "#{sym}=")
-    @table.delete sym
+    begin
+      singleton_class.__send__(:remove_method, sym, "#{sym}=")
+    rescue NameError
+    end
+    @table.delete(sym) do
+      raise NameError.new("no field `#{sym}' in #{self}", sym)
+    end
   end
 
   InspectKey = :__inspect_key__ # :nodoc: