deploy: a66bae1

Author: JanWeldert

_modules/pisa/core/events_pi.html

@@ -81,6 +81,7 @@ <h1>Source code for pisa.core.events_pi</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">collections.abc</span> <span class="kn">import</span> <span class="n">Mapping</span><span class="p">,</span> <span class="n">Iterable</span><span class="p">,</span> <span class="n">Sequence</span>
 <span class="kn">from</span> <span class="nn">collections</span> <span class="kn">import</span> <span class="n">OrderedDict</span>
 <span class="kn">import</span> <span class="nn">copy</span>
+<span class="kn">import</span> <span class="nn">re</span>
 
 <span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
 
@@ -633,8 +634,11 @@ <h1>Source code for pisa.core.events_pi</h1><div class="highlight"><pre>
             <span class="c1"># Create the cut expression, and get the resulting mask</span>
             <span class="n">crit_str</span> <span class="o">=</span> <span class="n">keep_criteria</span>
             <span class="k">for</span> <span class="n">variable_name</span> <span class="ow">in</span> <span class="n">variables</span><span class="p">:</span>
-                <span class="n">crit_str</span> <span class="o">=</span> <span class="n">crit_str</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span>
-                    <span class="n">variable_name</span><span class="p">,</span> <span class="s1">&#39;self[&quot;</span><span class="si">%s</span><span class="s1">&quot;][&quot;</span><span class="si">%s</span><span class="s1">&quot;]&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="n">key</span><span class="p">,</span> <span class="n">variable_name</span><span class="p">)</span>
+                <span class="c1"># using word boundary \b to replace whole words only</span>
+                <span class="n">crit_str</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">sub</span><span class="p">(</span>
+                    <span class="sa">r</span><span class="s1">&#39;\b</span><span class="si">{}</span><span class="s1">\b&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">variable_name</span><span class="p">),</span>
+                    <span class="s1">&#39;self[&quot;</span><span class="si">%s</span><span class="s1">&quot;][&quot;</span><span class="si">%s</span><span class="s1">&quot;]&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="n">key</span><span class="p">,</span> <span class="n">variable_name</span><span class="p">),</span>
+                    <span class="n">crit_str</span>
                 <span class="p">)</span>
             <span class="n">mask</span> <span class="o">=</span> <span class="nb">eval</span><span class="p">(</span><span class="n">crit_str</span><span class="p">)</span>  <span class="c1"># pylint: disable=eval-used</span>