diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 15:07:18 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 15:07:18 -0700 |
| commit | b63fd841a188f9b21aed40c7b2f046a144fd37c9 (patch) | |
| tree | 3c5522df6b0038a8cf85e80bfb0737af5aa9ec2d /lib/puppet/network | |
| parent | c8215c550cbe7e3ad059637202b02267d401946d (diff) | |
| parent | 51855e7f17877871aa8ec4f1ed7226c1d95ce66b (diff) | |
Merge branch 'next'
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/client.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/network/format.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb index cd88b9d84..c56b21393 100644 --- a/lib/puppet/network/client.rb +++ b/lib/puppet/network/client.rb @@ -23,7 +23,7 @@ class Net::HTTP # JJM: This is a "backport" of sorts to older ruby versions which # do not have this accessor. See #896 for more information. - attr_accessor :enable_post_connection_check unless Net::HTTP.instance_methods.include? "enable_post_connection_check" + attr_accessor :enable_post_connection_check unless Net::HTTP.method_defined? "enable_post_connection_check" end # The base class for all of the clients. Many clients just directly diff --git a/lib/puppet/network/format.rb b/lib/puppet/network/format.rb index 9cd6cf0b5..69895c344 100644 --- a/lib/puppet/network/format.rb +++ b/lib/puppet/network/format.rb @@ -106,6 +106,6 @@ class Puppet::Network::Format method = send(name) - return(type == :class ? klass.respond_to?(method) : klass.instance_methods.include?(method)) + return(type == :class ? klass.respond_to?(method) : klass.method_defined?(method)) end end |