Commit 6d19d975 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] python 3 compatibility

4591.	[port]		Addressed some python 3 compatibility issues.
			Thanks to Ville Skytta. [RT #44955] [RT #44956]
parent 88740c7f
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 4590. [bug] Support for PTHREAD_MUTEX_ADAPTIVE_NP was not being
properly detected. [RT #44871] properly detected. [RT #44871]
......
...@@ -73,7 +73,7 @@ def parse_time(s): ...@@ -73,7 +73,7 @@ def parse_time(s):
pass pass
# try to parse as a number with a suffix indicating unit of time # 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) m = r.match(s)
if not m: if not m:
raise ValueError("Cannot parse %s" % s) raise ValueError("Cannot parse %s" % s)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
try: try:
import yaml import yaml
except: except:
print "I: No python yaml module, skipping" print("I: No python yaml module, skipping")
exit(1) exit(1)
import subprocess import subprocess
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment