# HG changeset patch # User Pierre-Yves David # Date 1277207255 -7200 # Node ID 85c4d5334f2cfc66e4611b5d509065e768a3ae1e # Parent 10efd227648e77be2e5aa284d4ddf1920f2d1be3 [refactor] refactor rtag keys generations. diff -r 10efd227648e -r 85c4d5334f2c rtags.py --- a/rtags.py Tue Jun 22 13:47:13 2010 +0200 +++ b/rtags.py Tue Jun 22 13:47:35 2010 +0200 @@ -82,16 +82,14 @@ self._tagdefs.clear() def _get_keys(self, stype, rtype, otype, tagged): - keys = [('*', rtype, '*', tagged), - ('*', rtype, otype, tagged), - (stype, rtype, '*', tagged), - (stype, rtype, otype, tagged)] - if stype == '*' or otype == '*': - keys.remove( ('*', rtype, '*', tagged) ) - if stype == '*': - keys.remove( ('*', rtype, otype, tagged) ) - if otype == '*': - keys.remove( (stype, rtype, '*', tagged) ) + keys = [] + if '*' not in (stype, otype): + keys.append(('*', rtype, '*', tagged)) + if '*' != stype: + keys.append(('*', rtype, otype, tagged)) + if '*' != otype: + keys.append((stype, rtype, '*', tagged)) + keys.append((stype, rtype, otype, tagged)) return keys def init(self, schema, check=True):