equal
deleted
inserted
replaced
924 else: |
924 else: |
925 return [("(", ())] + JoinList([(" OR ", ())], vars) + [(")", ())] |
925 return [("(", ())] + JoinList([(" OR ", ())], vars) + [(")", ())] |
926 elif type(paths) == ListType: |
926 elif type(paths) == ListType: |
927 vars = [self.ComputePaths(path) for path in paths] |
927 vars = [self.ComputePaths(path) for path in paths] |
928 return JoinList([(" AND ", ())], vars) |
928 return JoinList([(" AND ", ())], vars) |
|
929 elif paths is None: |
|
930 return [("TRUE", ())] |
929 else: |
931 else: |
930 return eval(paths) |
932 return eval(paths) |
931 |
933 |
932 def ComputeExpression(self, body, connections, order = False): |
934 def ComputeExpression(self, body, connections, order = False): |
933 paths = self.GeneratePaths(connections, body, order) |
935 paths = self.GeneratePaths(connections, body, order) |