diff options
| author | Francesco Rodriguez <lrodriguezsanc@gmail.com> | 2012-12-19 17:52:50 -0500 |
|---|---|---|
| committer | Francesco Rodriguez <lrodriguezsanc@gmail.com> | 2012-12-19 17:52:50 -0500 |
| commit | a1cffa6d5849b45f439be62742ccca1633dfc9bd (patch) | |
| tree | 287a4ca3d6076098e3fa6cb9cace3d327893ff2b /actionpack/lib | |
| parent | f0129da38572e5cc5b633b7b4cc003808c56ba30 (diff) | |
| download | rails-a1cffa6d5849b45f439be62742ccca1633dfc9bd.tar.gz rails-a1cffa6d5849b45f439be62742ccca1633dfc9bd.tar.bz2 rails-a1cffa6d5849b45f439be62742ccca1633dfc9bd.zip | |
remove code for Ruby 1.8.x support
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/router/utils.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router/utils.rb b/actionpack/lib/action_dispatch/journey/router/utils.rb index a21b570013..56df459bfb 100644 --- a/actionpack/lib/action_dispatch/journey/router/utils.rb +++ b/actionpack/lib/action_dispatch/journey/router/utils.rb @@ -31,13 +31,8 @@ module ActionDispatch safe_pchar = "#{URI::REGEXP::PATTERN::UNRESERVED}#{reserved_pchar}" safe_segment = "#{safe_pchar}#{reserved_segment}" safe_fragment = "#{safe_pchar}#{reserved_fragment}" - if RUBY_VERSION >= '1.9' - UNSAFE_SEGMENT = Regexp.new("[^#{safe_segment}]", false).freeze - UNSAFE_FRAGMENT = Regexp.new("[^#{safe_fragment}]", false).freeze - else - UNSAFE_SEGMENT = Regexp.new("[^#{safe_segment}]", false, 'N').freeze - UNSAFE_FRAGMENT = Regexp.new("[^#{safe_fragment}]", false, 'N').freeze - end + UNSAFE_SEGMENT = Regexp.new("[^#{safe_segment}]", false).freeze + UNSAFE_FRAGMENT = Regexp.new("[^#{safe_fragment}]", false).freeze end Parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI |