third_party: Update waf to version 2.0.17

[samba.git] / third_party / waf / waflib / ConfigSet.py

diff --git a/third_party/waf/waflib/ConfigSet.py b/third_party/waf/waflib/ConfigSet.py
index b300bb56b7cfee1c2375346304ff3f0bbef36fa9..901fba6c06703288682201ac467453196062e8a9 100644 (file)
--- a/third_party/waf/waflib/ConfigSet.py
+++ b/third_party/waf/waflib/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))