Set 'attribute' token for XPath 2 with multi-label ('kind test', 'axis')

sissaschool · Dec 11, 2019 · af3a65f · af3a65f
1 parent 02c5798
commit af3a65f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,10 @@
 CHANGELOG
 *********
 
+`v1.3.3`_ (2019-12-xx)
+======================
+* Fix 'attribute' multi-role token (axis and kind test)
+
 `v1.3.2`_ (2019-12-10)
 ======================
 * Add token labels 'sequence types' and 'kind test' for callables that are not XPath functions
@@ -175,3 +179,4 @@ CHANGELOG
 .. _v1.3.0: https://github.com/brunato/elementpath/compare/v1.2.1...v1.3.0
 .. _v1.3.1: https://github.com/brunato/elementpath/compare/v1.3.0...v1.3.1
 .. _v1.3.2: https://github.com/brunato/elementpath/compare/v1.3.1...v1.3.2
+.. _v1.3.3: https://github.com/brunato/elementpath/compare/v1.3.2...v1.3.3
diff --git a/doc/conf.py b/doc/conf.py
@@ -31,7 +31,7 @@
 # The short X.Y version
 version = '1.3'
 # The full version, including alpha/beta/rc tags
-release = '1.3.2'
+release = '1.3.3'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/elementpath/__init__.py b/elementpath/__init__.py
@@ -8,7 +8,7 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
-__version__ = '1.3.2'
+__version__ = '1.3.3'
 __author__ = "Davide Brunato"
 __contact__ = "brunato@sissa.it"
 __copyright__ = "Copyright 2018-2019, SISSA"

diff --git a/elementpath/xpath2_constructors.py b/elementpath/xpath2_constructors.py
@@ -419,7 +419,7 @@ def evaluate(self, context=None):
 # multi-value label (using a tuple of values) and a custom pattern. Finally a custom nud
 # or led method is required.
 unregister('attribute')
-register('attribute', lbp=90, rbp=90, label=('function', 'axis'),
+register('attribute', lbp=90, rbp=90, label=('kind test', 'axis'),
          pattern=r'\battribute(?=\s*\:\:|\s*\(\:.*\:\)\s*\:\:|\s*\(|\s*\(\:.*\:\)\()')
 
 
@@ -441,7 +441,7 @@ def nud(self):
                 self.parser.advance(',')
                 self[1:] = self.parser.expression(5),
         self.parser.advance(')')
-        self.label = 'function'
+        self.label = 'kind test'
     return self
 
 

diff --git a/publiccode.yml b/publiccode.yml
@@ -6,8 +6,8 @@ publiccodeYmlVersion: '0.2'
 name: elementpath
 url: 'https://github.com/sissaschool/elementpath'
 landingURL: 'https://github.com/sissaschool/elementpath'
-releaseDate: '2019-12-10'
-softwareVersion: v1.3.2
+releaseDate: '2019-12-xx'
+softwareVersion: v1.3.3
 developmentStatus: stable
 platforms:
   - linux

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name='elementpath',
-    version='1.3.2',
+    version='1.3.3',
     packages=['elementpath'],
     author='Davide Brunato',
     author_email='brunato@sissa.it',