From 06713f6d61d1ff2de96626cb7b6894aacad6b267 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Wed, 10 Feb 2016 10:14:56 +0000
Subject: [PATCH] Updated to pyparsing 2.1.0
---
README.md | 2 +-
fsl/fsleyes/gl/shaders/glsl/parse.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 3423a2a3a..fcd6e1d92 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Dependencies
| [matplotlib](http://matplotlib.org/) | 1.4.3 |
| [nibabel](http://nipy.org/nibabel/) | 1.3.0 |
| [Pillow](https://python-pillow.github.io/) | 2.5.3 |
-| [PyParsing](http://pyparsing.wikispaces.com/) | 2.0.3 |
+| [PyParsing](http://pyparsing.wikispaces.com/) | 2.1.0 |
| [Jinja2](http://jinja.pocoo.org/) | 2.8 |
| [wxPython](http://wxpython.org/) | 3.0.2.0 |
| [OSMesa](http://mesa3d.org/) | 8.0.5 |
diff --git a/fsl/fsleyes/gl/shaders/glsl/parse.py b/fsl/fsleyes/gl/shaders/glsl/parse.py
index 7fff5d14d..1b3ee4a64 100644
--- a/fsl/fsleyes/gl/shaders/glsl/parse.py
+++ b/fsl/fsleyes/gl/shaders/glsl/parse.py
@@ -127,7 +127,7 @@ def getDeclarations(code):
# Value
VALUE = (EXPRESSION |
pp.Word(pp.alphanums + '_()+-/*')).setParseAction(
- pp.keepOriginalText)
+ pp.originalTextFor)
# Single declaration
VARIABLE = (IDENTIFIER.setResultsName('name') +
--
GitLab