backport stable

.hgtags

@@ -54,3 +54,5 @@
 cb66c5a9918dd8958dd3cdf48f8bdd0c2786b76a rql-debian-version-0.26.2-1
 7fb422fc2032ecc5a93528ed382e083b212b1cbf rql-version-0.26.3
 aca033de456a6b526045f9be0dbdb770e67912ab rql-debian-version-0.26.3-1
+bcf24f8a29c07146220816565a132ba148cdf82a rql-version-0.26.4
+88b739e85c615fc41a964f39e853fe77aaf3f207 rql-debian-version-0.26.4-1

ChangeLog

 ChangeLog for RQL
 =================
 
+2010-07-28  --  0.26.4
+    * fix re-annotation pb: some stinfo keys were not properly reinitialized
+      which may cause pb later (at sql generation time for instance)
+
+
+
 2010-06-21  --  0.26.3
     * support for node from having in Select.remove
 

__pkginfo__.py

@@ -20,7 +20,7 @@
 __docformat__ = "restructuredtext en"
 
 modname = "rql"
-numversion = (0, 26, 3)
+numversion = (0, 26, 4)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'

debian/changelog

+rql (0.26.4-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Wed, 28 Jul 2010 10:29:47 +0200
+
 rql (0.26.3-1) unstable; urgency=low
 
   * new upstream release

nodes.py

@@ -19,4 +19,5 @@
 
 This module defines all the nodes we can find in a RQL Syntax tree, except
 root nodes, defined in the `stmts` module.
+"""
 
@@ -22,5 +23,4 @@
 
-"""
 __docformat__ = "restructuredtext en"
 
 from itertools import chain
@@ -861,6 +861,9 @@
             # constant node linked to an uid variable if any
             'constnode': None,
             })
+        # remove optional st infos
+        for key in ('optrelations', 'blocsimplification', 'ftirels'):
+            self.stinfo.pop(key, None)
 
     def add_optional_relation(self, relation):
         try: