diff options
Diffstat (limited to 'Lib/lib2to3/fixes/fix_tuple_params.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_tuple_params.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Lib/lib2to3/fixes/fix_tuple_params.py b/Lib/lib2to3/fixes/fix_tuple_params.py index cad755f..6361717 100644 --- a/Lib/lib2to3/fixes/fix_tuple_params.py +++ b/Lib/lib2to3/fixes/fix_tuple_params.py @@ -58,8 +58,8 @@ class FixTupleParams(fixer_base.BaseFix): end = Newline() else: start = 0 - indent = "; " - end = pytree.Leaf(token.INDENT, "") + indent = u"; " + end = pytree.Leaf(token.INDENT, u"") # We need access to self for new_name(), and making this a method # doesn't feel right. Closing over self and new_lines makes the @@ -67,10 +67,10 @@ class FixTupleParams(fixer_base.BaseFix): def handle_tuple(tuple_arg, add_prefix=False): n = Name(self.new_name()) arg = tuple_arg.clone() - arg.prefix = "" + arg.prefix = u"" stmt = Assign(arg, n.clone()) if add_prefix: - n.prefix = " " + n.prefix = u" " tuple_arg.replace(n) new_lines.append(pytree.Node(syms.simple_stmt, [stmt, end.clone()])) @@ -95,7 +95,7 @@ class FixTupleParams(fixer_base.BaseFix): # TODO(cwinter) suite-cleanup after = start if start == 0: - new_lines[0].prefix = " " + new_lines[0].prefix = u" " elif is_docstring(suite[0].children[start]): new_lines[0].prefix = indent after = start + 1 @@ -115,7 +115,7 @@ class FixTupleParams(fixer_base.BaseFix): # Replace lambda ((((x)))): x with lambda x: x if inner.type == token.NAME: inner = inner.clone() - inner.prefix = " " + inner.prefix = u" " args.replace(inner) return @@ -123,7 +123,7 @@ class FixTupleParams(fixer_base.BaseFix): to_index = map_to_index(params) tup_name = self.new_name(tuple_name(params)) - new_param = Name(tup_name, prefix=" ") + new_param = Name(tup_name, prefix=u" ") args.replace(new_param.clone()) for n in body.post_order(): if n.type == token.NAME and n.value in to_index: @@ -158,7 +158,7 @@ def map_to_index(param_list, prefix=[], d=None): if d is None: d = {} for i, obj in enumerate(param_list): - trailer = [Subscript(Number(str(i)))] + trailer = [Subscript(Number(unicode(i)))] if isinstance(obj, list): map_to_index(obj, trailer, d=d) else: @@ -172,4 +172,4 @@ def tuple_name(param_list): l.append(tuple_name(obj)) else: l.append(obj) - return "_".join(l) + return u"_".join(l) |