backport stable

.hgtags

@@ -52,3 +52,5 @@
 3142115086127f3e9995081fff3fef3d420838cf rql-debian-version-0.26.1-1
 7d5bef1742bc302309668982af10409bcc96eadf rql-version-0.26.2
 cb66c5a9918dd8958dd3cdf48f8bdd0c2786b76a rql-debian-version-0.26.2-1
+7fb422fc2032ecc5a93528ed382e083b212b1cbf rql-version-0.26.3
+aca033de456a6b526045f9be0dbdb770e67912ab rql-debian-version-0.26.3-1

ChangeLog

 ChangeLog for RQL
 =================
 
-	--
+2010-06-21  --  0.26.3
+    * support for node from having in Select.remove
+
     * enhanced Select.replace method
@@ -5,3 +7,4 @@
     * enhanced Select.replace method
+
     * rql st checker now checks function avaibility according to backend (if specified)
 
@@ -6,5 +9,7 @@
     * rql st checker now checks function avaibility according to backend (if specified)
 
+
+
 2010-06-11  --  0.26.2
     * totally remove 'IS' operator
 

__pkginfo__.py

@@ -20,7 +20,7 @@
 __docformat__ = "restructuredtext en"
 
 modname = "rql"
-numversion = (0, 26, 2)
+numversion = (0, 26, 3)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'
@@ -28,7 +28,7 @@
 author = "Logilab"
 author_email = "contact@logilab.fr"
 
-short_desc = "relationship query language (RQL) utilities"
+description = "relationship query language (RQL) utilities"
 long_desc = """A library providing the base utilities to handle RQL queries,
 such as a parser, a type inferencer.
 """

debian/changelog

+rql (0.26.3-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Mon, 21 Jun 2010 09:34:41 +0200
+
 rql (0.26.2-1) unstable; urgency=low
 
   * new upstream release

setup.py

@@ -40,7 +40,7 @@
 
 sys.modules.pop('__pkginfo__', None)
 # import required features
-from __pkginfo__ import modname, version, license, short_desc, long_desc, \
+from __pkginfo__ import modname, version, license, description, long_desc, \
      web, author, author_email
 # import optional features
 import __pkginfo__
@@ -185,7 +185,7 @@
     return setup(name = distname,
                  version = version,
                  license = license,
-                 description = short_desc,
+                 description = description,
                  long_description = long_desc,
                  author = author,
                  author_email = author_email,

stmts.py

@@ -677,6 +677,9 @@
         term.parent = self
         self.selection.append(term)
 
+    # XXX proprify edition, we should specify if we want:
+    # * undo support
+    # * references handling
     def replace(self, oldnode, newnode):
         if oldnode is self.where:
             self.where = newnode
@@ -703,7 +706,9 @@
             self.remove_sort_term(node)
         elif node in self.groupby:
             self.remove_group_var(node)
-        # XXX having, selection
+        elif node in self.having:
+            self.having.remove(node)
+        # XXX selection
         else:
             raise Exception('duh XXX')
         node.parent = None