diff options
author | Markus Roberts <Markus@reality.com> | 2010-07-09 18:01:34 -0700 |
---|---|---|
committer | Markus Roberts <Markus@reality.com> | 2010-07-09 18:01:34 -0700 |
commit | 051bd98751d9d4bc97f93f66723d9b7a00c0cfb4 (patch) | |
tree | 988c93a8943949262c56089f87ee79249674aa4f /lib/puppet | |
parent | 77f8599f55be12bf5c7d69ac8f439d1fd756eafc (diff) | |
download | puppet-051bd98751d9d4bc97f93f66723d9b7a00c0cfb4.tar.gz puppet-051bd98751d9d4bc97f93f66723d9b7a00c0cfb4.tar.xz puppet-051bd98751d9d4bc97f93f66723d9b7a00c0cfb4.zip |
Code smell: Miscellaneous oddity removal
* Changed "string = self[1].gsub(%r((?:\\\\[\\\\bfnrt\"/]|(?:\\\\u(?:[A-Fa-f\\d]{4}))+|\\\\[\\x20-\\xff]))n) do |c|" to "string = self[1].gsub(%r{(?:\\\\[\\\\bfnrt\"/]|(?:\\\\u(?:[A-Fa-f\\d]{4}))+|\\\\[\\x20-\\xff])}n) do |c|" in lib/puppet/external/pson/pure/parser.rb
*
* Changed "\"$\"" to "'$'" in lib/puppet/provider/augeas/augeas.rb
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/external/pson/pure/parser.rb | 2 | ||||
-rw-r--r-- | lib/puppet/provider/augeas/augeas.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/external/pson/pure/parser.rb b/lib/puppet/external/pson/pure/parser.rb index 16643ac02..56c27f762 100644 --- a/lib/puppet/external/pson/pure/parser.rb +++ b/lib/puppet/external/pson/pure/parser.rb @@ -128,7 +128,7 @@ module PSON def parse_string if scan(STRING) return '' if self[1].empty? - string = self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c| + string = self[1].gsub(%r{(?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff])}n) do |c| if u = UNESCAPE_MAP[$&[1]] u else # \uXXXX diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb index 5329c0fbd..3a35c3241 100644 --- a/lib/puppet/provider/augeas/augeas.rb +++ b/lib/puppet/provider/augeas/augeas.rb @@ -102,7 +102,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do # Rip off any ticks if they are there. p = p[1, (p.size - 2)] if p[0,1] == "'" || p[0,1] == "\"" p.chomp!("/") - if p[0,1] != "$" && p[0,1] != "/" + if p[0,1] != '$' && p[0,1] != "/" argline << context + p else argline << p |