serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astie...@apache.org
Subject svn commit: r1814604 - /serf/trunk/SConstruct
Date Wed, 08 Nov 2017 17:05:28 GMT
Author: astieger
Date: Wed Nov  8 17:05:28 2017
New Revision: 1814604

URL: http://svn.apache.org/viewvc?rev=1814604&view=rev
Log:
Follow-up to r1811083, fix building with scons 3.0.0 and Python3

* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid
  TypeError: cannot use a string pattern on a bytes-like object

Modified:
    serf/trunk/SConstruct

Modified: serf/trunk/SConstruct
URL: http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1814604&r1=1814603&r2=1814604&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Wed Nov  8 17:05:28 2017
@@ -182,7 +182,7 @@ env.Append(BUILDERS = {
 match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
                   'SERF_MINOR_VERSION ([0-9]+).*'
                   'SERF_PATCH_VERSION ([0-9]+)',
-                  env.File('serf.h').get_contents(),
+                  env.File('serf.h').get_contents().decode('utf-8'),
                   re.DOTALL)
 MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
 env.Append(MAJOR=str(MAJOR))



Mime
View raw message