Permalink
Browse files

ruby 1.9 fixes

  • Loading branch information...
Jonathan Wilkins
Jonathan Wilkins committed Feb 6, 2012
1 parent 715390a commit d40b60c6bf070d507dc1be8e76faac61a62a956c
Showing with 6 additions and 6 deletions.
  1. +2 −2 lib/soap/generator.rb
  2. +3 −3 lib/soap/property.rb
  3. +1 −1 lib/soap/rpc/element.rb
View
@@ -176,7 +176,7 @@ def encode_name_end(ns, data)
def encode_tag(elename, attrs = nil)
if attrs.nil? or attrs.empty?
@buf << "\n#{ @indent }<#{ elename }>"
- return
+ return
end
ary = []
attrs.each do |key, value|
@@ -270,7 +270,7 @@ def get_encoded(str)
def get_encode_char_regexp
ENCODE_CHAR_REGEXP[XSD::Charset.encoding] ||=
- Regexp.new("[#{EncodeMap.keys.join}]", nil, XSD::Charset.encoding)
+ Regexp.new("[#{EncodeMap.keys.join}]", nil)
end
def find_handler(encodingstyle)
View
@@ -65,9 +65,9 @@ def initialize
KEY_REGSRC = '([^=:\\\\]*(?:\\\\.[^=:\\\\]*)*)'
DEF_REGSRC = '\\s*' + KEY_REGSRC + '\\s*[=:]\\s*(.*)'
- COMMENT_REGEXP = Regexp.new('^(?:#.*|)$', nil, 'u')
- CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$", nil, 'u')
- LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$", nil, 'u')
+ COMMENT_REGEXP = Regexp.new('^(?:#.*|)$', nil)
+ CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$", nil)
+ LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$", nil)
def load(stream)
key_prefix = ""
stream.each_with_index do |line, lineno|
View
@@ -230,7 +230,7 @@ def init_param(param)
mapped_class = SOAPMethod.parse_mapped_class(param.mapped_class)
qname = param.qname
if qname.nil? and mapped_class
- qname = TypeMap.index(mapped_class)
+ qname = TypeMap.key(mapped_class)
end
case param.io_type
when IN

0 comments on commit d40b60c

Please sign in to comment.