[master] python 3 compatibility
4591. [port] Addressed some python 3 compatibility issues. Thanks to Ville Skytta. [RT #44955] [RT #44956]
This commit is contained in:
3
CHANGES
3
CHANGES
@@ -1,3 +1,6 @@
|
||||
4591. [port] Addressed some python 3 compatibility issues.
|
||||
Thanks to Ville Skytta. [RT #44955] [RT #44956]
|
||||
|
||||
4590. [bug] Support for PTHREAD_MUTEX_ADAPTIVE_NP was not being
|
||||
properly detected. [RT #44871]
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ def parse_time(s):
|
||||
pass
|
||||
|
||||
# try to parse as a number with a suffix indicating unit of time
|
||||
r = re.compile('([0-9][0-9]*)\s*([A-Za-z]*)')
|
||||
r = re.compile(r'([0-9][0-9]*)\s*([A-Za-z]*)')
|
||||
m = r.match(s)
|
||||
if not m:
|
||||
raise ValueError("Cannot parse %s" % s)
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
try:
|
||||
import yaml
|
||||
except:
|
||||
print "I: No python yaml module, skipping"
|
||||
print("I: No python yaml module, skipping")
|
||||
exit(1)
|
||||
|
||||
import subprocess
|
||||
|
||||
Reference in New Issue
Block a user