Commit 2fd9231a authored by Stefan Behnel's avatar Stefan Behnel

cleanup, support unbound method calls to bytes.decode()

parent 1f8ffaa1
...@@ -1033,8 +1033,6 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform): ...@@ -1033,8 +1033,6 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform):
if len(args) < 1 or len(args) > 3: if len(args) < 1 or len(args) > 3:
self._error_wrong_arg_count('bytes.decode', node, args, '1-3') self._error_wrong_arg_count('bytes.decode', node, args, '1-3')
return node return node
if is_unbound_method:
return node
if not isinstance(args[0], ExprNodes.SliceIndexNode): if not isinstance(args[0], ExprNodes.SliceIndexNode):
# we need the string length as a slice end index # we need the string length as a slice end index
return node return node
...@@ -1069,12 +1067,6 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform): ...@@ -1069,12 +1067,6 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform):
is_temp = node.is_temp, is_temp = node.is_temp,
) )
return self._substitute_method_call(
node, decode_function,
self.PyUnicode_DecodeXyz_func_type,
'decode', is_unbound_method,
[string_node, stop, error_handling_node])
return ExprNodes.PythonCapiCallNode( return ExprNodes.PythonCapiCallNode(
node.pos, "PyUnicode_Decode", node.pos, "PyUnicode_Decode",
self.PyUnicode_Decode_func_type, self.PyUnicode_Decode_func_type,
...@@ -1082,12 +1074,6 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform): ...@@ -1082,12 +1074,6 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform):
is_temp = node.is_temp, is_temp = node.is_temp,
) )
return self._substitute_method_call(
node, "PyUnicode_Decode",
self.PyUnicode_Decode_func_type,
'decode', is_unbound_method,
[string_node, stop, encoding_node, error_handling_node])
def _find_special_codec_name(self, encoding): def _find_special_codec_name(self, encoding):
try: try:
requested_codec = codecs.getencoder(encoding) requested_codec = codecs.getencoder(encoding)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment