diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-23 13:19:53 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-23 13:19:53 -0700 |
| commit | 36f4dc5e1527fc46f097080c12bb1ee5c3d46714 (patch) | |
| tree | 1f1a5547aac5eb338f274a786f4d56db32aec7a2 /lib/puppet/util/rdoc/parser.rb | |
| parent | ad85b67ade99a3ec4ed4a8e578c9d288706b567d (diff) | |
| parent | 36a5665f3e0aeb8b9141cb8be2f69f8568078986 (diff) | |
| download | puppet-36f4dc5e1527fc46f097080c12bb1ee5c3d46714.tar.gz puppet-36f4dc5e1527fc46f097080c12bb1ee5c3d46714.tar.xz puppet-36f4dc5e1527fc46f097080c12bb1ee5c3d46714.zip | |
Merge branch 'ticket/next/6820_ruby19_fixes' into next
* ticket/next/6820_ruby19_fixes:
(#6820) Fix File class lookup in the file type for Ruby 1.9
(#6820) Fix nagios parser to use proper hash syntax for Ruby 1.9
(#6820) Fix Invalid multibyte character
(#6820) Fix RDOC parser to work with Ruby 1.9
(#6820) Fix invalid next that should be a return
(#2782) Fix constant_defined?
Diffstat (limited to 'lib/puppet/util/rdoc/parser.rb')
| -rw-r--r-- | lib/puppet/util/rdoc/parser.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb index 0f746e2ea..762ce25f0 100644 --- a/lib/puppet/util/rdoc/parser.rb +++ b/lib/puppet/util/rdoc/parser.rb @@ -7,13 +7,19 @@ require "rdoc/code_objects" require "puppet/util/rdoc/code_objects" require "rdoc/tokenstream" -require "rdoc/markup/simple_markup/preprocess" -require "rdoc/parsers/parserfactory" + +if ::RUBY_VERSION =~ /1.9/ + require "rdoc/markup/preprocess" + require "rdoc/parser" +else + require "rdoc/markup/simple_markup/preprocess" + require "rdoc/parsers/parserfactory" +end module RDoc class Parser - extend ParserFactory + extend ParserFactory unless ::RUBY_VERSION =~ /1.9/ SITE = "__site__" |