summaryrefslogtreecommitdiffstats
path: root/ConfigSet.py
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-17 17:31:04 +0100
committerDavid Robillard <d@drobilla.net>2019-03-17 17:31:04 +0100
commit619946be846e7cfa9b79ccd433746f172ccdefc3 (patch)
treed2dcbaf61f3749f73dc7a5e10d3fc6cd5e6e129a /ConfigSet.py
parenta91b5d65f3b2fea48d7cfb62f85d3669941560e9 (diff)
downloadsratom-619946be846e7cfa9b79ccd433746f172ccdefc3.tar.gz
sratom-619946be846e7cfa9b79ccd433746f172ccdefc3.tar.bz2
sratom-619946be846e7cfa9b79ccd433746f172ccdefc3.zip
Squashed 'waflib/' changes from 915dcb1..e7a29b6
e7a29b6 Upgrade to waf 2.0.15 8280f9d Add command for running executables from the build directory 8073c1a Make make_simple_dox() safe in case of exception 70d03b8 Avoid use of global counter hacks for configuration display b7d689a Rewrite test framework 94deadf Automatically add options and move add_flags() to options context f4259ee Reduce system include path noise 927b608 Automatically display configuration header c44b8f3 Set line justification from a constant in the wscript a48e26f Automatically detect if wscript has a test hook ef66724 Save runtime variables in the environment 63bcbcd Clean up TestContext b1d9505 Add ExecutionContext for setting runtime environment 387c1df Add show_diff() and test_file_equals() utilities 29d4d29 Fix in-tree library paths 9fde01f Add custom configuration context 6d3612f Add lib_path_name constant git-subtree-dir: waflib git-subtree-split: e7a29b6b9b2f842314244c23c14d8f8f560904e1
Diffstat (limited to 'ConfigSet.py')
-rw-r--r--ConfigSet.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ConfigSet.py b/ConfigSet.py
index b300bb5..901fba6 100644
--- a/ConfigSet.py
+++ b/ConfigSet.py
@@ -11,7 +11,7 @@ The values put in :py:class:`ConfigSet` must be serializable (dicts, lists, stri
import copy, re, os
from waflib import Logs, Utils
-re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M)
+re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M)
class ConfigSet(object):
"""
@@ -312,7 +312,7 @@ class ConfigSet(object):
:type filename: string
"""
tbl = self.table
- code = Utils.readf(filename, m='rU')
+ code = Utils.readf(filename, m='r')
for m in re_imp.finditer(code):
g = m.group
tbl[g(2)] = eval(g(3))