Fix for filenames which contain regular expressions

anesthetic/read/cobaya.py

@@ -52,7 +52,7 @@ def read_cobaya(root, *args, **kwargs):
  dirname, basename = os.path.split(root)
 
  files = os.listdir(os.path.dirname(root))
- regex = basename + r'.([0-9]+)\.txt'
+ regex = re.escape(basename) + r'.([0-9]+)\.txt'
  matches = [re.match(regex, f) for f in files]
  chains_files = [(m.group(1), os.path.join(dirname, m.group(0)))
  for m in matches if m]

anesthetic/read/getdist.py

@@ -61,7 +61,7 @@ def read_getdist(root, *args, **kwargs):
  dirname, basename = os.path.split(root)
 
  files = os.listdir(os.path.dirname(root))
- regex = basename + r'((_|.)([0-9]+)|)\.txt'
+ regex = re.escape(basename) + r'((_|.)([0-9]+)|)\.txt'
  matches = [re.match(regex, f) for f in files]
  chains_files = [(m.group(3), os.path.join(dirname, m.group(0)))
  for m in matches if m]

tests/example_data/gd_single+X.paramnames

@@ -0,0 +1,5 @@
+x0 x_0
+x1 x_1
+x2 x_2
+x3 x_3
+x4 x_4

tests/test_reader.py

@@ -4,6 +4,7 @@
 import pytest
 import numpy as np
 from numpy.testing import assert_array_equal, assert_array_almost_equal
+from pandas.testing import assert_frame_equal
 import matplotlib.pyplot as plt
 from anesthetic import MCMCSamples, NestedSamples
 from anesthetic import read_chains
@@ -253,3 +254,9 @@ def test_discard_burn_in(root):
 def test_read_fail():
  with pytest.raises(FileNotFoundError):
  read_chains('./tests/example_data/foo')
+
+
+def test_regex_escape():
+ mcmc_1 = read_chains('./tests/example_data/gd_single+X')
+ mcmc_2 = read_chains('./tests/example_data/gd_single')
+ assert_frame_equal(mcmc_1, mcmc_2)