From: Stefan Behnel Date: Fri, 22 Aug 2008 13:21:09 +0000 (+0200) Subject: more cleanup X-Git-Tag: 0.9.9.2.beta~63^2~51 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a990eae9b7f72a945d1350ec2597cdd6b6c05404;p=cython.git more cleanup --- diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py index fe91abdd..729b4e6f 100644 --- a/Cython/Compiler/Nodes.py +++ b/Cython/Compiler/Nodes.py @@ -1805,13 +1805,14 @@ class DefNode(FuncDefNode): # raise an error if not all keywords were read code.putln('if (unlikely(kw_args > 0)) {') - code.put('if (!__Pyx_CheckKeywords(%s, "%s", %s)) ' % ( + # __Pyx_CheckKeywords() this does more than strictly + # necessary, but this is not performance critical at all + code.put('__Pyx_CheckKeywords(%s, "%s", %s); ' % ( Naming.kwds_cname, self.name.utf8encode(), Naming.kwdlist_cname)) code.putln(code.error_goto(self.pos)) code.putln('}') # convert arg values to their final type and assign them - default_seen = False for i, arg in enumerate(tuple(positional_args) + tuple(kw_only_args)): if arg.default: code.putln("if (values[%d]) {" % i) @@ -1827,7 +1828,7 @@ class DefNode(FuncDefNode): required_arg = arg break code.putln('} else {') - code.putln('__Pyx_RaiseKeywordRequired("%s", "%s");' % ( + code.put('__Pyx_RaiseKeywordRequired("%s", "%s"); ' % ( self.name.utf8encode(), required_arg.name.utf8encode())) code.putln(code.error_goto(self.pos)) code.putln('}')