← Back to branch summary

~ubuntu-branches/ubuntu/wily/prewikka/wily

« back to all changes in this revision

Viewing changes to prewikka/Filter.py

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-07-08 08:33:50 UTC
  • mfrom: (1.1.9 upstream) (8.1.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090708083350-zqmdq1l666lsv366
Tags: 0.9.17-1ubuntu1
* Merge from debian unstable, Ubuntu remaining changes:
  - debian/rules: Append --install-layout=deb to setup.py install arguments.
  - debian/control: Bump python-all-dev, python-central, debhelper build
    dependencies (as per New Policy).

Show diffs side-by-side

added added

removed removed

Lines of Context:
prewikka/Filter.py
37
37
        i = 0
38
38
        while True:
39
39
            name = prelude.idmef_class_get_child_name(root, i)
40
 
            if name == None: 
 
40
            if name == None:
41
41
                break
42
 
            
 
42
 
43
43
            if criteria_root != None:
44
44
                criteria = "%s.%s" % (criteria_root, name)
45
45
            else:
63
63
        self.elements = elements
64
64
        self.formula = formula
65
65
 
66
 
        crit = prelude.idmef_criteria_new_from_string(str(self))
 
66
        crit = prelude.idmef_criteria_new_from_string(unicode(self).encode("utf8"))
67
67
        prelude.idmef_criteria_destroy(crit)
68
 
        
 
68
 
69
69
    def _replace(self, element):
70
70
        element = element.group(1)
71
71
        if element in ("and", "AND", "&&"):