From: Stefan Behnel <scoder@users.berlios.de>
Date: Thu, 15 Apr 2010 14:13:55 +0000 (+0200)
Subject: cleanup
X-Git-Tag: 0.13.beta0~199
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba225656bbedc7710a25eb9ceee053036289aa1e;p=cython.git

cleanup
---

diff --git a/Cython/Compiler/Optimize.py b/Cython/Compiler/Optimize.py
index 78a81063..cb2666e9 100644
--- a/Cython/Compiler/Optimize.py
+++ b/Cython/Compiler/Optimize.py
@@ -1674,8 +1674,7 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform):
             node, "__Pyx_PyUnicode_Tailmatch", self.PyUnicode_Tailmatch_func_type,
             method_name, is_unbound_method, args,
             utility_code = unicode_tailmatch_utility_code)
-        return ExprNodes.CoerceToPyTypeNode(
-            method_call, self.current_env(), Builtin.bool_type)
+        return method_call.coerce_to(Builtin.bool_type, self.current_env())
 
     PyUnicode_Find_func_type = PyrexTypes.CFuncType(
         PyrexTypes.c_py_ssize_t_type, [
@@ -1713,8 +1712,7 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform):
         method_call = self._substitute_method_call(
             node, "PyUnicode_Find", self.PyUnicode_Find_func_type,
             method_name, is_unbound_method, args)
-        return ExprNodes.CoerceToPyTypeNode(
-            method_call, self.current_env(), PyrexTypes.py_object_type)
+        return method_call.coerce_to_pyobject(self.current_env())
 
     PyUnicode_Count_func_type = PyrexTypes.CFuncType(
         PyrexTypes.c_py_ssize_t_type, [
@@ -1740,8 +1738,7 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform):
         method_call = self._substitute_method_call(
             node, "PyUnicode_Count", self.PyUnicode_Count_func_type,
             'count', is_unbound_method, args)
-        return ExprNodes.CoerceToPyTypeNode(
-            method_call, self.current_env(), PyrexTypes.py_object_type)
+        return method_call.coerce_to_pyobject(self.current_env())
 
     PyUnicode_Replace_func_type = PyrexTypes.CFuncType(
         Builtin.unicode_type, [