From 551f2d5ee9b730ff37f66617407b8cfbb82c78f5 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Thu, 27 Aug 2009 23:46:29 +0100 Subject: [PATCH] Simplify --- pybindgen/typehandlers/base.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pybindgen/typehandlers/base.py b/pybindgen/typehandlers/base.py index 2bd3af2..2952be9 100644 --- a/pybindgen/typehandlers/base.py +++ b/pybindgen/typehandlers/base.py @@ -303,13 +303,13 @@ class ParseTupleParameters(object): template = ['"'] last_was_optional = False for (param_template, dummy, - dummy, optional) in self._parse_tuple_items: - if not (last_was_optional and optional or not last_was_optional): - raise ValueError("Error: optional parameter followed by a non-optional one" - " (debug: self._parse_tuple_parameters=%r)" % self._parse_tuple_items) + param_name, optional) in self._parse_tuple_items: + if last_was_optional and not optional: + raise ValueError("Error: optional parameter followed by a non-optional one (%r)" + " (debug: self._parse_tuple_parameters=%r)" % (param_name, self._parse_tuple_items)) if not last_was_optional and optional: template.append('|') - last_was_optional = optional + last_was_optional = True template.append(param_template) template.append('"') params = [''.join(template)]